This commit is contained in:
inxi-svn 2011-05-21 23:20:21 +00:00
parent 02e122f8aa
commit 58abfed757

6
inxi
View file

@ -2617,28 +2617,26 @@ detect_desktop_environment()
version=$( get_de_version 'xfdesktop' 'xfdesktop[[:space:]]version' '5' )
if [[ -z $version ]];then
version='4'
else
fi
if [[ $B_EXTRA_DATA == 'true' ]];then
toolkit=$( get_de_version 'xfdesktop' 'Built[[:space:]]with[[:space:]]GTK' '4' )
if [[ -n $toolkit ]];then
version="$version (Gtk+ $toolkit)"
fi
fi
fi
desktop_environment="Xfce"
# when 5 is released, the string may need updating
elif [[ -n $( grep -is '\"xfce5\"' <<< "$xprop_root" ) ]];then
version=$( get_de_version 'xfdesktop' 'xfdesktop[[:space:]]version' '5' )
if [[ -z $version ]];then
version='5'
else
fi
if [[ $B_EXTRA_DATA == 'true' ]];then
toolkit=$( get_de_version 'xfdesktop' 'Built[[:space:]]with[[:space:]]GTK' '4' )
if [[ -n $toolkit ]];then
version="$version (Gtk+ $toolkit)"
fi
fi
fi
desktop_environment="Xfce"
elif [[ -n $( grep -is 'BLACKBOX_PID' <<< "$xprop_root" ) ]];then
if [[ -n $( grep -is 'fluxbox' <<< "$ps_aux" | grep -v 'grep' ) ]];then