From cbadc3fa6d5f17d8c2cb0b36bda9ebb837758dfc Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Thu, 6 Nov 2014 04:51:47 -0500 Subject: Imported Upstream version 2.2.16 --- inxi | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'inxi') diff --git a/inxi b/inxi index 65bbed1..7e20697 100755 --- a/inxi +++ b/inxi @@ -1,8 +1,8 @@ #!/usr/bin/env bash ######################################################################## #### Script Name: inxi -#### Version: 2.2.15 -#### Date: 2014-10-12 +#### Version: 2.2.16 +#### Date: 2014-11-03 #### Patch Number: 00 ######################################################################## #### SPECIAL THANKS @@ -4856,8 +4856,9 @@ get_de_gtk_data() get_display_manager() { eval $LOGFS - # ldm - LTSP display manager - local dm_id_list='entranced.pid gdm.pid gdm3.pid kdm.pid ldm.pid lightdm.pid lxdm.pid mdm.pid nodm.pid slim.lock tint2.pid wdm.pid xdm.pid' + # ldm - LTSP display manager. Note that sddm does not appear to have a .pid extension in Arch + # note: to avoid positives with directories, test for -f explicitly, not -e + local dm_id_list='entranced.pid gdm.pid gdm3.pid kdm.pid ldm.pid lightdm.pid lxdm.pid mdm.pid nodm.pid sddm.pid sddm slim.lock tint2.pid wdm.pid xdm.pid' local dm_id='' dm='' separator='' # note we don't need to filter grep if we do it this way local x_is_running=$( grep '/usr.*/X' <<< "$Ps_aux_Data" | grep -iv '/Xprt' ) @@ -4865,7 +4866,8 @@ get_display_manager() for dm_id in $dm_id_list do # note: ${dm_id%.*}/$dm_id will create a dir name out of the dm id, then test if pid is in that - if [[ -e /run/$dm_id || -e /run/${dm_id%.*}/$dm_id || -e /var/run/$dm_id ]];then + if [[ -f /run/$dm_id || -f /run/${dm_id%.*}/$dm_id || -f /var/run/$dm_id || \ + -f /var/run/${dm_id%.*}/$dm_id ]];then # just on the off chance that two dms are running, good info to have in that case, if possible dm=$dm$separator${dm_id%.*} separator=',' -- cgit v1.2.3