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

no version change, new tarball. This is a purely code cosmetic change, XDG_CuRRENT_DESKTOP now shows X-Cinnamon

Browse source 
for cinnamon, so added an xdg test to skip the xrop -root section. Since either will catch it fine, there is
no actual difference in output or outcome.
This commit is contained in:
inxi-svn 2014-09-24 06:20:41 +00:00
parent dedb8d5fa7
commit caa106f85e
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
inxi
View file

@ -4431,7 +4431,7 @@ get_desktop_environment()
desktop_environment="KDE" desktop_environment="KDE"
elif [[ $XDG_CURRENT_DESKTOP == 'Unity' ]];then elif [[ $XDG_CURRENT_DESKTOP == 'Unity' ]];then
version=$( get_program_version 'unity' '^unity' '2' ) version=$( get_program_version 'unity' '^unity' '2' )
# not certain cinn will always have version, so keep output right if not # not certain will always have version, so keep output right if not
if [[ -n $version ]];then if [[ -n $version ]];then
version="$version " version="$version "
fi fi
@ -4458,6 +4458,20 @@ get_desktop_environment()
fi fi
fi fi
desktop_environment='LXQt' desktop_environment='LXQt'
# note, X-Cinnamon value strikes me as highly likely to change, so just search for the last part
elif [[ -n $XDG_CURRENT_DESKTOP && -z ${XDG_CURRENT_DESKTOP/*innamon*/} ]];then
version=$( get_program_version 'cinnamon' '^cinnamon' '2' )
# not certain cinn will always have version, so keep output right if not
if [[ -n $version ]];then
version="$version "
fi
if [[ $B_EXTRA_DATA == 'true' ]];then
toolkit=$( get_de_gtk_data )
if [[ -n $toolkit ]];then
version="$version(Gtk $toolkit)"
fi
fi
desktop_environment="Cinnamon"
fi fi
# did we find it? If not, start the xprop tests # did we find it? If not, start the xprop tests
if [[ -z $desktop_environment ]];then if [[ -z $desktop_environment ]];then
@ -4792,6 +4806,10 @@ get_de_gtk_data()
fi fi
elif type -p pacman &>/dev/null;then elif type -p pacman &>/dev/null;then
toolkit=$( pacman -Qi gtk3 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' ) toolkit=$( pacman -Qi gtk3 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' )
# just guessing on gkt 4 package name
if [[ -z $toolkit ]];then
toolkit=$( pacman -Qi gtk4 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' )
fi
if [[ -z $toolkit ]];then if [[ -z $toolkit ]];then
toolkit=$( pacman -Qi gtk2 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' ) toolkit=$( pacman -Qi gtk2 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' )
fi fi