From d2986cbe8a2070e60219bca8342bee5137d2ed78 Mon Sep 17 00:00:00 2001
From: Harald Hope <smxi@users.noreply.github.com>
Date: Sat, 24 Dec 2016 15:02:59 -0800
Subject: [PATCH] New version, new tarball. This fixes an issue where sloppy
 regex was removing the BIOS from BIOSTAR. Also fixed a few other sloppy gsub,
 and fixed a few gensub errors as well.

Since BIOSTAR is a fairly common mobo, I'm surprised I haven't gotten this bug report
before.

This closes issue #102.
---
 inxi           | 17 +++++++++--------
 inxi.changelog | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/inxi b/inxi
index 72c7ebd..b5263b1 100755
--- a/inxi
+++ b/inxi
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 ########################################################################
 ####  Script Name: inxi
-####  Version: 2.3.6
-####  Date: 2016-12-19
+####  Version: 2.3.7
+####  Date: 2016-12-24
 ####  Patch Number: 00
 ########################################################################
 ####  SPECIAL THANKS
@@ -6031,7 +6031,7 @@ get_dmidecode_data()
 					sub(/^[[:space:]]+/, "", twoData)
 					sub(/^Base Board .*|^Chassis .*|empty|.*O\.E\.M\..*|.*OEM.*|^Not .*|^System .*|.*unknow.*|.*N\/A.*|none|^To be filled.*|^0x[0]+$|\[Empty\]|<Bad Index>|^\.\.$/, "", twoData) 
 					sub(/.*(AssetTagNum|Manufacturer| Or Motherboard|PartNum.*|SerNum).*/, "", twoData)
-					gsub(/bios|acpi/, "", twoData)
+					gsub(/\ybios\y|\yacpi\y/, "", twoData) # note: biostar
 					sub(/http:\/\/www.abit.com.tw\//, "Abit", twoData)
 					
 					# for double indented values replace with ~ so later can test for it, we are trusting that
@@ -6269,8 +6269,8 @@ get_graphics_card_data()
 		gsub(/'"$BAN_LIST_ARRAY"'/, " ", $NF)
 		gsub(/^ +| +$/, "", $NF)
 		gsub(/ [ \t]+/, " ", $NF)
-		busId=gensub(/^([0-9a-f:\.]+) (.+)$/,"\\1","",$1)
-		trueCard=gensub(/(.*)\.([0-9]+)$/,"\\2","",busId)
+		busId=gensub(/^([0-9a-f:\.]+) (.+)$/,"\\1","g",$1)
+		trueCard=gensub(/(.*)\.([0-9]+)$/,"\\2","g",busId)
 		if ( trueCard == 0 ) {
 			print $NF "," busId
 		}
@@ -6518,7 +6518,7 @@ get_graphics_display_server_data()
 			vendorRelease=""
 		}
 		/vendor string/ {
-			gsub(/the|inc|foundation|project|corporation/, "", $2)
+			gsub(/\ythe\y|\yinc\y|foundation|project|corporation/, "", $2)
 			gsub(/'"$BAN_LIST_ARRAY"'/, " ", $2)
 			gsub(/^ +| +$/, "", $2)
 			gsub(/ [ \t]+/, " ", $2)
@@ -6660,6 +6660,7 @@ get_hdd_data_basic()
 	fi
 	# echo ss: $swap_size
 	hdd_data="$( eval $df_string )"
+	
 	# eval $df_string | awk 'BEGIN{tot=0} !/total/ {tot+=$4} END{print tot}'
 	log_function_data 'raw' "hdd_data:\n$hdd_data"
 	hdd_used=$( echo "$hdd_data" | gawk -v bsdType="$BSD_TYPE" -v swapSize="$swap_size" '
@@ -7090,7 +7091,7 @@ get_hdd_temp_data()
 {
 	eval $LOGFS
 	local hdd_temp='' sudo_command='' 
-
+	
 	if [[ $B_HDDTEMP_TESTED != 'true' ]];then
 		B_HDDTEMP_TESTED='true'
 		HDDTEMP_PATH=$( type -p hddtemp )
@@ -7374,7 +7375,7 @@ get_machine_data()
 					# System manufacturer|System Product Name|System Version
 					# To Be Filled By O.E.M.
 					sub(/^Base Board .*|^Chassis .*|.*O\.E\.M\..*|.*OEM.*|^Not .*|^System .*|.*unknow.*|.*N\/A.*|none|^To be filled.*/, "", $0)
-					gsub(/bios|acpi/, "", $0)
+					gsub(/\ybios\y|\yacpi\y/, "", $0) # note: biostar
 					sub(/http:\/\/www.abit.com.tw\//, "Abit", $0)
 					gsub(/^ +| +$/, "", $0)
 					gsub(/ [ \t]+/, " ", $0)
diff --git a/inxi.changelog b/inxi.changelog
index 74c636c..db85462 100644
--- a/inxi.changelog
+++ b/inxi.changelog
@@ -1,3 +1,21 @@
+=====================================================================================
+Version: 2.3.7
+Patch Version: 00
+Script Date:  2016-12-24
+-----------------------------------
+Changes:
+-----------------------------------
+New version, new tarball. This fixes an issue where sloppy regex was removing the BIOS
+from BIOSTAR. Also fixed a few other sloppy gsub, and fixed a few gensub errors as well.
+
+Since BIOSTAR is a fairly common mobo, I'm surprised I haven't gotten this bug report 
+before.
+
+This closes issue #102.
+
+-----------------------------------
+-- Harald Hope - Sat, 24 Dec 2016 14:53:31 -0800
+
 =====================================================================================
 Version: 2.3.6
 Patch Version: 00