dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-17 00:31:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added in an xfce version fix for arch, user reports xfdesktop did not return a value, so we'll add a second test, xfce4-panel

Browse source 
--version and see if that works
This commit is contained in:
inxi-svn 2014-01-13 23:55:02 +00:00
parent 062f941199
commit 68ede84adc
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
inxi
View file

@ -3891,9 +3891,13 @@ get_desktop_environment()
# alternate: xfce4-about --version > xfce4-about 4.10.0 (Xfce 4.10) # alternate: xfce4-about --version > xfce4-about 4.10.0 (Xfce 4.10)
if [[ -n $( grep -Eis '\"xfce4\"' <<< "$xprop_root" ) ]];then if [[ -n $( grep -Eis '\"xfce4\"' <<< "$xprop_root" ) ]];then
version=$( get_de_app_version 'xfdesktop' 'xfdesktop[[:space:]]version' '5' ) version=$( get_de_app_version 'xfdesktop' 'xfdesktop[[:space:]]version' '5' )
# arch linux reports null, so use alternate if null
if [[ -z $version ]];then
version=$( get_de_app_version 'xfce4-panel' '^xfce4-panel' '2' )
if [[ -z $version ]];then if [[ -z $version ]];then
version='4' version='4'
fi fi
fi
if [[ $B_EXTRA_DATA == 'true' ]];then if [[ $B_EXTRA_DATA == 'true' ]];then
toolkit=$( get_de_app_version 'xfdesktop' 'Built[[:space:]]with[[:space:]]GTK' '4' ) toolkit=$( get_de_app_version 'xfdesktop' 'Built[[:space:]]with[[:space:]]GTK' '4' )
if [[ -n $toolkit ]];then if [[ -n $toolkit ]];then
@ -3904,9 +3908,13 @@ get_desktop_environment()
# when 5 is released, the string may need updating # when 5 is released, the string may need updating
elif [[ -n $( grep -is '\"xfce5\"' <<< "$xprop_root" ) ]];then elif [[ -n $( grep -is '\"xfce5\"' <<< "$xprop_root" ) ]];then
version=$( get_de_app_version 'xfdesktop' 'xfdesktop[[:space:]]version' '5' ) version=$( get_de_app_version 'xfdesktop' 'xfdesktop[[:space:]]version' '5' )
# arch linux reports null, so use alternate if null
if [[ -z $version ]];then
version=$( get_de_app_version 'xfce5-panel' '^xfce5-panel' '2' )
if [[ -z $version ]];then if [[ -z $version ]];then
version='5' version='5'
fi fi
fi
if [[ $B_EXTRA_DATA == 'true' ]];then if [[ $B_EXTRA_DATA == 'true' ]];then
toolkit=$( get_de_app_version 'xfdesktop' 'Built[[:space:]]with[[:space:]]GTK' '4' ) toolkit=$( get_de_app_version 'xfdesktop' 'Built[[:space:]]with[[:space:]]GTK' '4' )
if [[ -n $toolkit ]];then if [[ -n $toolkit ]];then