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

New version, new tarball. Two new desktop/window managers added: spectrwm (similar to scrotwm) and

Browse source 
herbstluftwm. Both tested and working, thanks anticap from Antix for doing the testing/issue report on this.
This commit is contained in:
inxi-svn 2013-07-01 22:15:51 +00:00
parent 8afddd9a29
commit 191e560418
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
inxi
View file

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
######################################################################## ########################################################################
#### Script Name: inxi #### Script Name: inxi
#### Version: 1.9.11 #### Version: 1.9.12
#### Date: June 19 2013 #### Date: July 2 2013
#### Patch Number: 00 #### Patch Number: 00
######################################################################## ########################################################################
#### SPECIAL THANKS #### SPECIAL THANKS
@ -3936,6 +3936,12 @@ get_desktop_environment()
version="$version " version="$version "
fi fi
desktop_environment="WM2" desktop_environment="WM2"
elif [[ -n $( grep -is 'herbstluftwm' <<< "$xprop_root" ) ]];then
version=$( get_de_app_version 'herbstluftwm' '^herbstluftwm' 'NF' )
if [[ -n $version ]];then
version="$version "
fi
desktop_environment="herbstluftwm"
fi fi
fi fi
# a few manual hacks for things that don't id with xprop, these are just good guesses # a few manual hacks for things that don't id with xprop, these are just good guesses
@ -3956,6 +3962,9 @@ get_desktop_environment()
elif [[ -n $( grep -is 'scrotwm' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then elif [[ -n $( grep -is 'scrotwm' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
version=$( get_de_app_version 'scrotwm' '^welcome.*scrotwm' '4' ) version=$( get_de_app_version 'scrotwm' '^welcome.*scrotwm' '4' )
desktop_environment='Scrotwm' # no --version for this one desktop_environment='Scrotwm' # no --version for this one
elif [[ -n $( grep -is 'spectrwm' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
version=$( get_de_app_version 'spectrwm' '^spectrwm.*welcome.*spectrwm' '5' )
desktop_environment='Spectrwm' # no --version for this one
elif [[ -n $( grep -Eis '([[:space:]]|/)twm' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then elif [[ -n $( grep -Eis '([[:space:]]|/)twm' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
desktop_environment='Twm' # no --version for this one desktop_environment='Twm' # no --version for this one
elif [[ -n $( grep -Eis '([[:space:]]|/)dwm' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then elif [[ -n $( grep -Eis '([[:space:]]|/)dwm' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
@ -3996,7 +4005,7 @@ get_de_app_version()
case $1 in case $1 in
# note, some wm/apps send version info to stderr instead of stdout # note, some wm/apps send version info to stderr instead of stdout
dwm|ksh|scrotwm) dwm|ksh|scrotwm|spectrwm)
version_data="$( $1 $get_version 2>&1 )" version_data="$( $1 $get_version 2>&1 )"
;; ;;
csh) csh)

13
inxi.changelog
View file

@ -1,3 +1,16 @@
=====================================================================================
Version: 1.9.12
Patch Version: 00
Script Date: July 2 2013
-----------------------------------
Changes:
-----------------------------------
New version, new tarball. Two new desktop/window managers added: spectrwm (similar to scrotwm) and
herbstluftwm. Both tested and working, thanks anticap from Antix for doing the testing/issue report on this.
-----------------------------------
-- Harald Hope - Mon, 01 Jul 2013 15:13:24 -0700
===================================================================================== =====================================================================================
Version: 1.9.11 Version: 1.9.11
Patch Version: 00 Patch Version: 00