From 44535d0b0cbe842710584376eb77a3b23f0d6d35 Mon Sep 17 00:00:00 2001
From: inxi-svn <inxi-svn@techpatterns.com>
Date: Mon, 6 Jul 2015 22:53:44 +0000
Subject: [PATCH] New version, new tarball. This fixes a bug with the last fix
 for KDE Plasma version. It was showing Frameworks version, which is
 apparently NOT the same as the plasma version.

Also added debugger kde versioning to make this stuff less of an ordeal for data collection.
---
 inxi           | 38 ++++++++++++++++++++++++++++----------
 inxi.changelog | 16 ++++++++++++++++
 2 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/inxi b/inxi
index 9ddafd0..d2007b1 100755
--- a/inxi
+++ b/inxi
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 ########################################################################
 ####  Script Name: inxi
-####  Version: 2.2.25
-####  Date: 2015-06-15
+####  Version: 2.2.26
+####  Date: 2015-07-06
 ####  Patch Number: 00
 ########################################################################
 ####  SPECIAL THANKS
@@ -1950,13 +1950,23 @@ debug_data_collector()
 			echo $KDE_FULL_SESSION &> $debug_data_dir/kde3-full-session.txt
 			echo $KDE_SESSION_VERSION &> $debug_data_dir/kde-gte-4-session-version.txt
 			if type -p kf5-config &>/dev/null; then
-				kf5-config --version &> $debug_data_dir/kf5-config-version-data.txt
+				kf5-config --version &> $debug_data_dir/kde-kf5-config-version-data.txt
 			elif type -p kf6-config &>/dev/null; then
-				kf6-config --version &> $debug_data_dir/kf6-config-version-data.txt
+				kf6-config --version &> $debug_data_dir/kde-kf6-config-version-data.txt
 			elif type -p kf$KDE_SESSION_VERSION-config &>/dev/null; then
-				kf$KDE_SESSION_VERSION-config --version &> $debug_data_dir/kf$KDE_SESSION_VERSION-KSV-config-version-data.txt
+				kf$KDE_SESSION_VERSION-config --version &> $debug_data_dir/kde-kf$KDE_SESSION_VERSION-KSV-config-version-data.txt
 			else
-				touch $debug_data_dir/kf-config-absent
+				touch $debug_data_dir/kde-kf-config-absent
+			fi
+			if type -p plasmashell &>/dev/null; then
+				plasmashell --version &> $debug_data_dir/kde-plasmashell-version-data.txt
+			else
+				touch $debug_data_dir/kde-plasmashell-absent
+			fi
+			if type -p kwin_x11 &>/dev/null; then
+				kwin_x11 --version &> $debug_data_dir/kde-kwin_x11-version-data.txt
+			else
+				touch $debug_data_dir/kde-kwin_x11-absent
 			fi
 			if type -p kded4 &>/dev/null; then
 				kded4 --version &> $debug_data_dir/kded4-version-data.txt
@@ -4520,7 +4530,7 @@ get_desktop_environment()
 	
 	# set the default, this function only runs in X, if null, don't print data out
 	local desktop_environment='' xprop_root='' version2=''
-	local version='' version_data='' toolkit=''
+	local version='' version_data='' version2_data='' toolkit=''
 
 	# works on 4, assume 5 will id the same, why not, no need to update in future
 	# KDE_SESSION_VERSION is the integer version of the desktop
@@ -4538,13 +4548,21 @@ get_desktop_environment()
 			#Qt: 5.4.2
 			#KDE Frameworks: 5.11.0
 			#kf5-config: 1.0
-			version_data=$( kf$KDE_SESSION_VERSION-config --version 2>/dev/null )
-			version=$( grep -si '^KDE Frameworks:' <<< "$version_data" | gawk '{print $NF}' )
+			# for QT, and Frameworks if we use it
+			if type -p kf$KDE_SESSION_VERSION-config &>/dev/null;then
+				version_data=$( kf$KDE_SESSION_VERSION-config --version 2>/dev/null )
+				# version=$( grep -si '^KDE Frameworks:' <<< "$version_data" | gawk '{print $NF}' )
+			fi
+			# plasmashell 5.3.90
+			if type -p plasmashell &>/dev/null;then
+				version2_data=$( plasmashell --version 2>/dev/null )
+				version=$( grep -si '^plasmashell' <<< "$version2_data" | gawk '{print $NF}' )
+			fi
 		fi
 		if [[ -z $version ]];then
 			version=$KDE_SESSION_VERSION
 		fi
-		if [[ $B_EXTRA_DATA == 'true' ]];then
+		if [[ $B_EXTRA_DATA == 'true' && -n $version_data ]];then
 			toolkit=$( grep -si '^Qt:' <<< "$version_data" | gawk '{print $2}' )
 			if [[ -n $toolkit ]];then
 				version="$version (Qt $toolkit)"
diff --git a/inxi.changelog b/inxi.changelog
index 6aa2994..a371c18 100755
--- a/inxi.changelog
+++ b/inxi.changelog
@@ -1,3 +1,19 @@
+=====================================================================================
+Version: 2.2.26
+Patch Version: 00
+Script Date:  2015-07-06
+-----------------------------------
+Changes:
+-----------------------------------
+New version, new tarball. This fixes a bug with the last fix for KDE Plasma version. It was
+showing Frameworks version, which is apparently NOT the same as the plasma version.
+
+Also added debugger kde versioning to make this stuff less of an ordeal for data collection.
+
+-----------------------------------
+-- Harald Hope - Mon, 06 Jul 2015 15:51:51 -0700
+
+
 =====================================================================================
 Version: 2.2.25
 Patch Version: 00