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

trying little fix for wm issues

Browse source
This commit is contained in:
inxi-svn 2011-05-26 20:33:10 +00:00
parent 088bf93df8
commit b698be9168
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
inxi
View file

@ -2822,9 +2822,12 @@ get_desktop_environment()
elif [[ -n $( grep -is 'awesome' <<< "$ps_aux" | grep -v 'grep' ) ]];then elif [[ -n $( grep -is 'awesome' <<< "$ps_aux" | grep -v 'grep' ) ]];then
version=$( get_de_version 'awesome' '^awesome' '2' ) version=$( get_de_version 'awesome' '^awesome' '2' )
desktop_environment='Awesome' desktop_environment='Awesome'
elif [[ -n $( grep -is 'twm' <<< "$ps_aux" | grep -v 'grep' ) ]];then elif [[ -n $( grep -is 'scrotwm' <<< "$ps_aux" | grep -v 'grep' ) ]];then
version=$( get_de_version 'scrotwm' '^welcome.*scrotwm' '4' )
desktop_environment='Scrotwm' # no --version for this one
elif [[ -n $( grep -is '[[:space:]]twm' <<< "$ps_aux" | grep -v 'grep' ) ]];then
desktop_environment='Twm' # no --version for this one desktop_environment='Twm' # no --version for this one
elif [[ -n $( grep -is 'dwm' <<< "$ps_aux" | grep -v 'grep' ) ]];then elif [[ -n $( grep -is '[[:space:]]dwm' <<< "$ps_aux" | grep -v 'grep' ) ]];then
version=$( get_de_version 'dwm' '^dwm' '1' ) version=$( get_de_version 'dwm' '^dwm' '1' )
desktop_environment='dwm' desktop_environment='dwm'
elif [[ -n $( grep -is 'wmii' <<< "$ps_aux" | grep -v 'grep' ) ]];then elif [[ -n $( grep -is 'wmii' <<< "$ps_aux" | grep -v 'grep' ) ]];then
@ -2857,7 +2860,8 @@ get_de_version()
IGNORECASE=1 IGNORECASE=1
} }
/'$2'/ { /'$2'/ {
sub(/(dwm-|wmii-)/, "",$'$3') # sample: dwm-5.8.2, ©.. etc, why no space? who knows. # sample: dwm-5.8.2, ©.. etc, why no space? who knows. Also get rid of v in number string
sub(/(dwm-|wmii-|v)/, "",$'$3')
gsub(",","",$0) # xfce, and other, output has , in it, so dump all commas gsub(",","",$0) # xfce, and other, output has , in it, so dump all commas
print $'$3' print $'$3'
exit # quit after first match prints exit # quit after first match prints