diff options
Diffstat (limited to 'inxi')
-rwxr-xr-x | inxi | 27 |
1 files changed, 24 insertions, 3 deletions
@@ -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 |