aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2014-11-06 04:51:51 -0500
committerLibravatarUnit 193 <unit193@ubuntu.com>2014-11-06 04:51:51 -0500
commitd978ce5694aa43f91c43abe9bcd6c5b946993f87 (patch)
tree6178fc1fb302635c28b16a31a4ee379a1d4d8a9e
parent45155f3f2b21f4dcf01d56e9af0bab7d557c4c8f (diff)
parentcbadc3fa6d5f17d8c2cb0b36bda9ebb837758dfc (diff)
downloadinxi-d978ce5694aa43f91c43abe9bcd6c5b946993f87.tar.bz2
inxi-d978ce5694aa43f91c43abe9bcd6c5b946993f87.tar.xz
inxi-d978ce5694aa43f91c43abe9bcd6c5b946993f87.tar.zst
Merge tag 'upstream/2.2.16'
Upstream version 2.2.16 # gpg: Signature made Thu 06 Nov 2014 04:51:49 AM EST using RSA key ID EBE9BD91 # gpg: Good signature from "Unit 193 <unit193@gmail.com>" # gpg: aka "Unit 193 <unit193@ninthfloor.org>" # gpg: aka "Unit 193 <unit193@ubuntu.com>"
-rwxr-xr-xinxi12
-rwxr-xr-xinxi.changelog18
2 files changed, 25 insertions, 5 deletions
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=','
diff --git a/inxi.changelog b/inxi.changelog
index 3ceea75..fbc4786 100755
--- a/inxi.changelog
+++ b/inxi.changelog
@@ -1,4 +1,22 @@
=====================================================================================
+Version: 2.2.16
+Patch Version: 00
+Script Date: 2014-11-03
+-----------------------------------
+Changes:
+-----------------------------------
+New version, tarball. Very small update, added sddm id to dm detecfion. Because Arch linux,
+at least on the system I got data from, is not using .pid/.lock extensions, but other systems
+are, I'm adding sddm AND sddm.pid detection. This required changing the id to use explicit -f
+for test, not the previous -e, which will force only files, not directories, to trigger yes case.
+
+No other changes, but it's worth updating to this because distros may start using sddm in the not so
+distant future, it's beta currently though.
+
+-----------------------------------
+-- Harald Hope - Mon, 03 Nov 2014 19:26:22 -0800
+
+=====================================================================================
Version: 2.2.15
Patch Version: 00
Script Date: 2014-10-12