From fd13a1efde08082afec0d21b0d945f904782c189 Mon Sep 17 00:00:00 2001
From: Harald Hope <smxi@users.noreply.github.com>
Date: Fri, 11 Aug 2017 12:09:15 -0700
Subject: [PATCH] New version, new tarball. Fixed issue #120 where -z fails to
 anonymize serial numbers.

Also fixed a FreeBSD issue where I'd failed to update -G to show driver.
---
 inxi           | 61 ++++++++++++++++++++++++++++++++++++++------------
 inxi.changelog | 14 ++++++++++++
 2 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/inxi b/inxi
index ebc801e..e44929f 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.34
-SELF_DATE=2017-08-04
+SELF_VERSION=2.3.35
+SELF_DATE=2017-08-11
 SELF_PATCH=00
 ########################################################################
 ####  SPECIAL THANKS
@@ -9651,7 +9651,7 @@ get_pciconf_card_data()
 					A_AUDIO_DATA[j]=$array_string
 					;;
 				display)
-					array_string="$device_string,${a_temp[4]},${a_temp[5]}"
+					array_string="$device_string,${a_temp[4]},${a_temp[5]},${a_temp[3]}"
 					A_GRAPHICS_CARD_DATA[j]=$array_string
 					;;
 				network)
@@ -12745,7 +12745,11 @@ print_battery_data()
 			fi
 			if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
 				if [[ -n ${a_battery_working[16]} ]];then
-					serial="${a_battery_working[16]} "
+					if [[ $B_OUTPUT_FILTER == 'true' ]];then
+						serial=$FILTER_STRING
+					else
+						serial="${a_battery_working[16]} "
+					fi
 				else 
 					serial='N/A '
 				fi
@@ -13554,8 +13558,13 @@ print_hard_disk_data()
 						fi
 					fi
 					if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
-						hdd_serial=${a_hdd_working[4]}
-						if [[ -z $hdd_serial ]];then
+						if [[ -n ${a_hdd_working[4]} ]];then
+							if [[ $B_OUTPUT_FILTER == 'true' ]];then
+								hdd_serial=$FILTER_STRING
+							else
+								hdd_serial=${a_hdd_working[4]}
+							fi
+						else
 							hdd_serial='N/A'
 						fi
 						hdd_serial="${C1}serial$SEP3${C2} $hdd_serial "
@@ -13874,9 +13883,16 @@ print_machine_data()
 				if [[ -n ${A_MACHINE_DATA[14]} ]];then
 					chassis_version=" ${C1}v$SEP3${C2} ${A_MACHINE_DATA[14]}"
 				fi
-				if [[ -n ${A_MACHINE_DATA[15]} && $B_OUTPUT_FILTER != 'true' ]];then
-					chassis_serial=" ${C1}serial$SEP3${C2} ${A_MACHINE_DATA[15]}"
+				if [[ -n ${A_MACHINE_DATA[15]} ]];then
+					if [[ $B_OUTPUT_FILTER == 'true' ]];then
+						chassis_serial=$FILTER_STRING
+					else
+						chassis_serial=${A_MACHINE_DATA[15]}
+					fi
+				else
+					chassis_serial='N/A'
 				fi
+				chassis_serial=" ${C1}serial$SEP3${C2} $chassis_serial"
 				if [[ -n "$chassis_vendor$chassis_type$chassis_version$chassis_serial" ]];then
 					chassis_line="${C1}Chassis$SEP3${C2}$chassis_vendor$chassis_type$chassis_version$chassis_serial"
 				fi
@@ -13899,9 +13915,16 @@ print_machine_data()
 		if [[ -n ${A_MACHINE_DATA[7]} ]];then
 			mobo_version=" ${C1}v$SEP3${C2} ${A_MACHINE_DATA[7]}"
 		fi
-		if [[ -n ${A_MACHINE_DATA[8]} && $B_OUTPUT_FILTER != 'true' ]];then
-			mobo_serial=" ${C1}serial$SEP3${C2} ${A_MACHINE_DATA[8]}"
+		if [[ -n ${A_MACHINE_DATA[8]} ]];then
+			if [[ $B_OUTPUT_FILTER == 'true' ]];then
+				mobo_serial=$FILTER_STRING
+			else
+				mobo_serial=${A_MACHINE_DATA[8]}
+			fi
+		else
+			mobo_serial='N/A'
 		fi
+		mobo_serial=" ${C1}serial$SEP3${C2} $mobo_serial"
 		if [[ -n ${A_MACHINE_DATA[9]} ]];then
 			bios_vendor=${A_MACHINE_DATA[9]}
 		else
@@ -13944,9 +13967,16 @@ print_machine_data()
 			if [[ -n ${A_MACHINE_DATA[2]} ]];then
 				product_version=" ${C1}v$SEP3${C2} ${A_MACHINE_DATA[2]}"
 			fi
-			if [[ -n ${A_MACHINE_DATA[3]} && $B_OUTPUT_FILTER != 'true' ]];then
-				product_serial=" ${C1}serial$SEP3${C2} ${A_MACHINE_DATA[3]} "
+			if [[ -n ${A_MACHINE_DATA[3]} ]];then
+				if [[ $B_OUTPUT_FILTER == 'true' ]];then
+					product_serial=$FILTER_STRING
+				else
+					product_serial=${A_MACHINE_DATA[3]}
+				fi
+			else
+				product_serial='N/A'
 			fi
+			product_serial=" ${C1}serial$SEP3${C2} $product_serial "
 			system_line="${C1}Device$SEP3${C2} $device ${C1}System$SEP3${C2} $system_vendor ${C1}product$SEP3${C2} $product_name$product_version$product_serial"
 			calculate_line_length "$system_line$chassis_line"
 			if [[ -n $chassis_line && $LINE_LENGTH -lt $COLS_INNER ]];then
@@ -15262,12 +15292,15 @@ print_ram_data()
 							fi
 							manufacturer="${C1}manufacturer$SEP3${C2} $manufacturer "
 							if [[ -n ${a_memory_item[14]} ]];then
-								serial_nu=${a_memory_item[14]}
+								if [[ $B_OUTPUT_FILTER == 'true' ]];then
+									serial_nu=$FILTER_STRING
+								else
+									serial_nu=${a_memory_item[14]}
+								fi
 							else
 								serial_nu='N/A'
 							fi
 							serial_nu="${C1}serial$SEP3${C2} $serial_nu "
-							
 							if [[ $device_size != 'N/A' && -n ${a_memory_item[16]} ]];then
 								bank_connection=" ${a_memory_item[16]}"
 							fi
diff --git a/inxi.changelog b/inxi.changelog
index b7ca3d0..a8d45bc 100644
--- a/inxi.changelog
+++ b/inxi.changelog
@@ -1,3 +1,17 @@
+=====================================================================================
+Version: 2.3.35
+Patch Version: 00
+Script Date: 2017-08-11
+-----------------------------------
+Changes:
+-----------------------------------
+New version, new tarball. Fixed issue #120 where -z fails to anonymize serial numbers.
+
+Also fixed a FreeBSD issue where I'd failed to update -G to show driver.
+
+-----------------------------------
+-- Harald Hope - Fri, 11 Aug 2017 12:07:17 -0700
+
 =====================================================================================
 Version: 2.3.34
 Patch Version: 00