From 191e560418d74ac71ce4e6035e16ab06e386864d Mon Sep 17 00:00:00 2001
From: inxi-svn <inxi-svn@techpatterns.com>
Date: Mon, 1 Jul 2013 22:15:51 +0000
Subject: [PATCH] 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.

---
 inxi           | 15 ++++++++++++---
 inxi.changelog | 13 +++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/inxi b/inxi
index 044233a..b1c355c 100755
--- a/inxi
+++ b/inxi
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 ########################################################################
 ####  Script Name: inxi
-####  Version: 1.9.11
-####  Date: June 19 2013
+####  Version: 1.9.12
+####  Date: July 2 2013
 ####  Patch Number: 00
 ########################################################################
 ####  SPECIAL THANKS
@@ -3936,6 +3936,12 @@ get_desktop_environment()
 					version="$version "
 				fi
 				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
 		# 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
 				version=$( get_de_app_version 'scrotwm' '^welcome.*scrotwm' '4' )
 				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
 				desktop_environment='Twm' # no --version for this one
 			elif [[ -n $( grep -Eis '([[:space:]]|/)dwm' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
@@ -3996,7 +4005,7 @@ get_de_app_version()
 	
 	case $1 in
 		# 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 )"
 			;;
 		csh)
diff --git a/inxi.changelog b/inxi.changelog
index f8c3916..e1a94d8 100755
--- a/inxi.changelog
+++ b/inxi.changelog
@@ -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
 Patch Version: 00