From d1ff06d7336dc133f91b128bf3652c32d2ea4f85 Mon Sep 17 00:00:00 2001
From: Harald Hope <smxi@users.noreply.github.com>
Date: Tue, 21 Nov 2017 10:41:48 -0800
Subject: [PATCH] New version, new tarball. Added some critical debugger tools
 for ongoing issue # 128 ARM data collection in /sys.

Using 'tree' now instead of ls if it is installed for debugger /sys tree listing.
Added to recommends. Updated bluetooth recommends to note it's dev only. That
should fix issue #127
---
 inxi           | 31 +++++++++++++++++++++----------
 inxi.changelog | 18 ++++++++++++++++++
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/inxi b/inxi
index 344cbef..c7a8171 100755
--- a/inxi
+++ b/inxi
@@ -2,8 +2,8 @@
 ########################################################################
 SELF_NAME='inxi' 
 # don't quote the following, parsers grab these too
-SELF_VERSION=2.3.43
-SELF_DATE=2017-10-31
+SELF_VERSION=2.3.44
+SELF_DATE=2017-11-21
 SELF_PATCH=00
 ########################################################################
 ####  SPECIAL THANKS
@@ -2173,10 +2173,7 @@ debug_data_collector()
 			echo $Line
 			sys_data_file=$SELF_DATA_DIR/$Debug_Data_Dir/sys-dir-traverse.txt
 			echo "Getting file paths in /sys..."
-			ls_sys 1
-			ls_sys 2
-			ls_sys 3
-			ls_sys 4
+			sys_tree
 			# note, this generates more lines than the full sys parsing, so only use if required
 			# ls_sys 5 
 			touch $sys_data_file
@@ -2202,7 +2199,9 @@ debug_data_collector()
 					return if $File::Find::name =~ /\/(\.[a-z]|__|parameters\/|debug\/)/;
 					# comment this one out if you experience hangs or if 
 					# we discover syntax of foreign language characters
-					return unless -T; # Must be ascii like
+					# Must be ascii like. This is questionable and might require further
+					# investigation, it is removing some characters that we might want
+					return unless -T; 
 					# print $File::Find::name . "\n";
 					push @content, $File::Find::name;
 					return;
@@ -2290,6 +2289,17 @@ debug_data_collector()
 	fi
 	exit 0
 }
+sys_tree()
+{
+	if type -p tree &>/dev/null;then
+		tree -a -L 10 /sys > $Debug_Data_Dir/sys-tree-10.txt
+	else
+		ls_sys 1
+		ls_sys 2
+		ls_sys 3
+		ls_sys 4
+	fi
+}
 ## args: $1 - depth
 ls_sys()
 {
@@ -2320,7 +2330,7 @@ ls_sys()
 		else if (!/^total / ) { 
 			print $0
 		} 
-	}' &> $Debug_Data_Dir/sys-dir-depth-$1.txt
+	}' &> $Debug_Data_Dir/sys-ls-$1.txt
 }
 
 ## args: $1 - debugger file name
@@ -2388,7 +2398,7 @@ check_recommends_user_output()
 	echo $Line
 	echo "Bash version: $( bash --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU bash/ {print $4}' )"
 	if type -p gawk &>/dev/null;then
-		gawk_version=$( gawk --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU Awk/ {print $3}' )
+		gawk_version=$( gawk --version 2>&1 | gawk 'BEGIN {IGNORECASE=1} /^GNU Awk/ {print $3}' )
 	fi
 	if type -p sed &>/dev/null;then
 		# sed (GNU sed) 4.4 OR GNU sed version 4.4
@@ -2486,7 +2496,7 @@ check_recommends_items()
 	dig:dnsutils~dnsutils~bind-utils:-i_first_wlan_ip_default_test
 	dmidecode:dmidecode~dmidecode~dmidecode~:-M_if_no_sys_machine_data;_-m_memory 
 	file:file~file~file~:-o_unmounted_file_system
-	hciconfig:bluez~bluez-utils~bluez-utils~:-n_-i_bluetooth_data
+	hciconfig:bluez~bluez-utils~bluez-utils~:-n_-i_bluetooth_data-dev_only-not_used
 	hddtemp:hddtemp~hddtemp~hddtemp~:-Dx_show_hdd_temp 
 	ifconfig:net-tools~net-tools~net-tools~:-i_ip_lan-deprecated
 	ip:iproute~iproute2~iproute~:-i_ip_lan
@@ -2496,6 +2506,7 @@ check_recommends_items()
 	modinfo:module-init-tools~module-init-tools~module-init-tools~:-Ax,-Nx_module_version 
 	runlevel:sysvinit~sysvinit~systemd~:-I_runlevel
 	sudo:sudo~sudo~sudo~:-Dx_hddtemp-user;-o_file-user
+	tree:tree~tree~tree~:-@1[1-5]_debugger_sys_tree
 	uptime:procps~procps~procps~:-I_uptime_(check_which_package_owns_Debian)
 	'
 	
diff --git a/inxi.changelog b/inxi.changelog
index adaf67e..7092d47 100644
--- a/inxi.changelog
+++ b/inxi.changelog
@@ -1,3 +1,21 @@
+=====================================================================================
+Version: 2.3.44
+Patch Version: 00
+Script Date: 2017-11-21
+-----------------------------------
+Changes:
+-----------------------------------
+
+New version, new tarball. Added some critical debugger tools for ongoing issue # 128 
+ARM data collection in /sys.
+
+Using 'tree' now instead of ls if it is installed for debugger /sys tree listing.
+Added to recommends. Updated bluetooth recommends to note it's dev only. That 
+should fix issue #127 
+
+-----------------------------------
+-- Harald Hope - Tue, 21 Nov 2017 10:35:34 -0800
+
 =====================================================================================
 Version: 2.3.43
 Patch Version: 00