From 847ba186a05215ca86e292c72d6a9c34df9fefef Mon Sep 17 00:00:00 2001
From: Harald Hope <smxi@users.noreply.github.com>
Date: Mon, 24 Jul 2017 21:13:03 -0700
Subject: [PATCH] New version, tarball. This fixes a bug where if there is a
 remote filesystem mounted, the path would crash gawk when searching for
 unumounted file systems, eg:

12.34.2.10:/remote/file/system

Fix is to escape '/'.
---
 inxi           | 13 +++++++------
 inxi.changelog | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/inxi b/inxi
index e127069..c9d4be5 100755
--- a/inxi
+++ b/inxi
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 ########################################################################
 ####  Script Name: inxi
-####  Version: 2.3.24
-####  Date: 2017-07-23
+####  Version: 2.3.25
+####  Date: 2017-07-24
 ####  Patch Number: 00
 ########################################################################
 ####  SPECIAL THANKS
@@ -6332,7 +6332,7 @@ get_graphics_card_data()
 	# cards are  either the same or different. We want only the .0 version as a valid
 	# card. .1 would be for example: Display Adapter with bus id x:xx.1, not the right one
 	/vga compatible controller|3D controller|Display controller/ {
-		trueCard=""
+		driver=""
 		gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF)
 		gsub(/'"$BAN_LIST_ARRAY"'/, " ", $NF)
 		gsub(/^ +| +$/, "", $NF)
@@ -8703,7 +8703,7 @@ get_partition_data()
 	# added devfs linprocfs sysfs fdescfs which show on debian kfreebsd kernel output
 	if [[ -z $BSD_TYPE ]];then
 		swap_data="$( swapon -s 2>/dev/null )"
-		df_string='df -h -T -P --exclude-type=aufs --exclude-type=devfs --exclude-type=devtmpfs 
+		df_string=' --exclude-type=aufs --exclude-type=devfs --exclude-type=devtmpfs 
 		--exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs --exclude-type=procfs
 		--exclude-type=squashfs --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs'
 	else
@@ -11459,7 +11459,8 @@ get_unmounted_partition_data()
 			a_unmounted_working=( ${A_PARTITION_DATA[i]} )
 			IFS="$ORIGINAL_IFS"
 			if [[ -n ${a_unmounted_working[6]} ]];then
-				mounted_partitions="$mounted_partitions$separator${a_unmounted_working[6]}"
+				# for remote mounts, the path would be: [domain|ip]:/path/in/remote
+				mounted_partitions="$mounted_partitions$separator${a_unmounted_working[6]//\//\\/}"
 			fi
 		done
 		# now we need to exclude the mdraid partitions from the unmounted partition output as well
@@ -11482,7 +11483,7 @@ get_unmounted_partition_data()
 		# note that size 1 means it is a logical extended partition container
 		# lvm might have dm-1 type syntax
 		# need to exclude loop type file systems, squashfs for example
-		/[a-z][0-9]+$|dm-[0-9]+$/ && $3 != 1 && $NF !~ /loop/ && $NF !~ /('$mounted_partitions')/ {
+		/[a-z][0-9]+$|dm-[0-9]+$/ && $3 != 1 && $NF !~ /loop/ && $NF !~ /'$mounted_partitions'/ {
 			size = sprintf( "%.2f", $3*1024/1000**3 )
 			print $4 "," size "G"
 		}' $FILE_PARTITIONS ) )
diff --git a/inxi.changelog b/inxi.changelog
index ad936ae..02c453a 100644
--- a/inxi.changelog
+++ b/inxi.changelog
@@ -1,3 +1,20 @@
+=====================================================================================
+Version: 2.3.25
+Patch Version: 00
+Script Date:  2017-07-24
+-----------------------------------
+Changes:
+-----------------------------------
+New version, tarball. This fixes a bug where if there is a remote filesystem mounted, the path 
+would crash gawk when searching for unumounted file systems, eg:
+
+12.34.2.10:/remote/file/system
+
+Fix is to escape '/'.
+
+-----------------------------------
+-- Harald Hope - Mon, 24 Jul 2017 21:10:54 -0700
+
 =====================================================================================
 Version: 2.3.24
 Patch Version: 00