From 19bc994f3fabf3702e79aae614471dbafc278ae7 Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Tue, 4 Oct 2011 03:19:08 +0000 Subject: [PATCH] trying a jvm fix, turns out some ps aux uses full path, like /usr/bin/jwm --- inxi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inxi b/inxi index de43b0e..3514632 100755 --- a/inxi +++ b/inxi @@ -2,8 +2,8 @@ ######################################################################## #### Script Name: inxi #### version: 1.7.23 -#### Date: July 27 2011 -#### Patch Number: 00 +#### Date: October 3 2011 +#### Patch Number: 01 ######################################################################## #### SPECIAL THANKS ######################################################################## @@ -3263,15 +3263,15 @@ get_desktop_environment() elif [[ -n $( grep -is 'scrotwm' <<< "$ps_aux" | grep -v 'grep' ) ]];then version=$( get_de_app_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 + elif [[ -n $( grep -Eis '([[:space:]]|/)twm' <<< "$ps_aux" | grep -v 'grep' ) ]];then desktop_environment='Twm' # no --version for this one - elif [[ -n $( grep -is '[[:space:]]dwm' <<< "$ps_aux" | grep -v 'grep' ) ]];then + elif [[ -n $( grep -Eis '([[:space:]]|/)dwm' <<< "$ps_aux" | grep -v 'grep' ) ]];then version=$( get_de_app_version 'dwm' '^dwm' '1' ) desktop_environment='dwm' elif [[ -n $( grep -is 'wmii' <<< "$ps_aux" | grep -v 'grep' ) ]];then version=$( get_de_app_version 'wmii' '^wmii' '1' ) desktop_environment='wmii' - elif [[ -n $( grep -is '[[:space:]]jwm' <<< "$ps_aux" | grep -v 'grep' ) ]];then + elif [[ -n $( grep -Eis '([[:space:]]|/)jwm' <<< "$ps_aux" | grep -v 'grep' ) ]];then version=$( get_de_app_version 'jwm' '^jwm' '2' ) desktop_environment='JWM' fi