fine tunings

This commit is contained in:
inxi-svn 2011-05-19 06:46:36 +00:00
parent 559b049add
commit 476f3cdad3

4
inxi
View file

@ -2557,14 +2557,16 @@ detect_desktop_environment()
version=" $version" version=" $version"
fi fi
# this is a hack, and has to be changed with every toolkit version change # this is a hack, and has to be changed with every toolkit version change
toolkit=$( pkg-config --modversion gtk+-3.0 2>/dev/null )
if [[ -z $toolkit ]];then
toolkit=$( pkg-config --modversion gtk+-2.0 2>/dev/null ) toolkit=$( pkg-config --modversion gtk+-2.0 2>/dev/null )
fi
if [[ -n $toolkit ]];then if [[ -n $toolkit ]];then
version="$version (Gtk: $toolkit)" version="$version (Gtk: $toolkit)"
fi fi
desktop_environment="Gnome${version}" desktop_environment="Gnome${version}"
# assume 5 will id the same, why not, no need to update in future # assume 5 will id the same, why not, no need to update in future
elif [[ $KDE_SESSION_VERSION == '5' ]]; then elif [[ $KDE_SESSION_VERSION == '5' ]]; then
desktop_environment='KDE 5'
version_data=$( kded5 --version 2>/dev/null ) version_data=$( kded5 --version 2>/dev/null )
version=$( grep -si '^KDE Development Platform:' <<< "$version_data" | gawk '{print $4}' ) version=$( grep -si '^KDE Development Platform:' <<< "$version_data" | gawk '{print $4}' )
if [[ -z $version ]];then if [[ -z $version ]];then