aboutsummaryrefslogtreecommitdiffstats
path: root/inxi
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@ubuntu.com>2014-08-20 22:50:14 -0400
committerLibravatarUnit 193 <unit193@ubuntu.com>2014-08-20 22:50:14 -0400
commitbecfccc15bec8ce83c2c3f6286fbf09f36c664c0 (patch)
tree0fa6d8ebf854183856a4ecaaeef6c907c4a3709d /inxi
parent5a20092c0bfeba0fdbb4b7c6a11aed32432022a6 (diff)
downloadinxi-becfccc15bec8ce83c2c3f6286fbf09f36c664c0.tar.bz2
inxi-becfccc15bec8ce83c2c3f6286fbf09f36c664c0.tar.xz
inxi-becfccc15bec8ce83c2c3f6286fbf09f36c664c0.tar.zst
Imported Upstream version 2.2.1upstream/2.2.1
Diffstat (limited to 'inxi')
-rwxr-xr-xinxi27
1 files changed, 24 insertions, 3 deletions
diff --git a/inxi b/inxi
index 56ae949..45871f8 100755
--- a/inxi
+++ b/inxi
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
########################################################################
#### Script Name: inxi
-#### Version: 2.2.0
-#### Date: 2014-08-18
+#### Version: 2.2.1
+#### Date: 2014-08-20
#### Patch Number: 00
########################################################################
#### SPECIAL THANKS
@@ -4313,6 +4313,27 @@ get_desktop_environment()
fi
fi
desktop_environment="Xfce"
+ # case where no xfce number exists, just xfce
+ elif [[ -n $( grep -is 'xfce' <<< "$xprop_root" ) ]];then
+ version=$( get_program_version 'xfdesktop' 'xfdesktop[[:space:]]version' '5' )
+ # arch linux reports null, so use alternate if null
+ if [[ -z $version ]];then
+ version=$( get_program_version 'xfce4-panel' '^xfce5-panel' '2' )
+ if [[ -z $version ]];then
+ # version=$( get_program_version 'xfce5-panel' '^xfce5-panel' '2' )
+ #if [[ -z $version ]];then
+ # version='5'
+ #fi
+ version='4'
+ fi
+ fi
+ if [[ $B_EXTRA_DATA == 'true' ]];then
+ toolkit=$( get_program_version 'xfdesktop' 'Built[[:space:]]with[[:space:]]GTK' '4' )
+ if [[ -n $toolkit ]];then
+ version="$version (Gtk $toolkit)"
+ fi
+ fi
+ desktop_environment="Xfce"
elif [[ -n $( grep -is 'BLACKBOX_PID' <<< "$xprop_root" ) ]];then
if [[ -n $( grep -is 'fluxbox' <<< "$Ps_aux_Data" ) ]];then
version=$( get_program_version 'fluxbox' '^fluxbox' '2' )
@@ -5941,7 +5962,7 @@ get_init_data()
if [[ -n $strings_init_version ]];then
init_version=$( gawk '{print $2}' <<< "$strings_init_version" )
fi
- # missing data:
+ # missing data: note, runit can install as a dependency without being the init system
# http://smarden.org/runit/sv.8.html
elif [[ -e /sbin/runit-init || -e /etc/runit || -n $( type -p sv ) ]];then
init_type='runit' # lower case