From 5850df917c7a168877f2d29340fb04429f9b9f39 Mon Sep 17 00:00:00 2001
From: Harald Hope <smxi@users.noreply.github.com>
Date: Sun, 15 Nov 2015 17:26:19 -0800
Subject: [PATCH] New version, new tarball. Try 2 at mmcblk support. I had
 mmcblock, thats not how it's reported to the system.

---
 inxi           | 12 ++++++------
 inxi.changelog | 13 +++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/inxi b/inxi
index a6fd6cd..e34cddb 100755
--- a/inxi
+++ b/inxi
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 ########################################################################
 ####  Script Name: inxi
-####  Version: 2.2.30
-####  Date: 2015-11-12
+####  Version: 2.2.31
+####  Date: 2015-11-15
 ####  Patch Number: 00
 ########################################################################
 ####  SPECIAL THANKS
@@ -6083,7 +6083,7 @@ get_hdd_data_basic()
 	# note that linux 3.2.45-grsec-9th types kernels have this type of partition name: /dev/xvdc (no number, letter)
 	# note: btrfs does not seem to use partition integers, just the primary /dev/sdx identifier
 	# df can also show /dev/disk/(by-label|by-uuid etc)
-	/^\/dev\/(disk\/|mapper\/|[hsv]d[a-z]+[0-9]*|dm[-]?[0-9]+|(ada|mmcblock)[0-9]+p[0-9]+.*|(ad|sd|wd)[0-9]+[a-z]|md[0-9]+|[aw]d[0-9]+s.*|xvd[a-z]+)|^ROOT/ {
+	/^\/dev\/(disk\/|mapper\/|[hsv]d[a-z]+[0-9]*|dm[-]?[0-9]+|(ada|mmcblk)[0-9]+p[0-9]+.*|(ad|sd|wd)[0-9]+[a-z]|md[0-9]+|[aw]d[0-9]+s.*|xvd[a-z]+)|^ROOT/ {
 		# this handles the case where the first item is too long
 		# and makes df wrap output to next line, so here we advance
 		# it to the next line for that single case. Using df -P should
@@ -6142,7 +6142,7 @@ get_hdd_data_basic()
 	if [[ $B_PARTITIONS_FILE == 'true' ]];then
 		A_HDD_DATA=( $(
 		gawk -v hddUsed=$hdd_used '
-		/([hsv]d[a-z]+|(ada|mmcblock)[0-9]+)$/ {
+		/([hsv]d[a-z]+|(ada|mmcblk)[0-9]+)$/ {
 			driveSize = $(NF - 1)*1024/1000**3
 			gsub(/,/, " ", driveSize)
 			gsub(/^ +| +$/, "", driveSize)
@@ -6372,8 +6372,8 @@ get_hard_drive_data_bsd()
 			size=0
 			bSetSize="false"
 		}
-		$1 ~ /^(ad|ada|mmcblock|sd|wd)[0-9]+(|[[:space:]]at.*)$/ {
-			diskId=gensub(/^((ad|ada|mmcblock|sd|wd)[0-9]+)[^0-9].*/,"\\1",1,$1)
+		$1 ~ /^(ad|ada|mmcblk|sd|wd)[0-9]+(|[[:space:]]at.*)$/ {
+			diskId=gensub(/^((ad|ada|mmcblk|sd|wd)[0-9]+)[^0-9].*/,"\\1",1,$1)
 			# note: /var/run/dmesg.boot may repeat items since it is not created
 			# fresh every boot, this way, only the last items will be used per disk id
 			if (aIds[diskId] == "" ) {
diff --git a/inxi.changelog b/inxi.changelog
index 68e75c4..c3ae1be 100755
--- a/inxi.changelog
+++ b/inxi.changelog
@@ -1,3 +1,16 @@
+=====================================================================================
+Version: 2.2.31
+Patch Version: 00
+Script Date:  2015-11-15
+-----------------------------------
+Changes:
+-----------------------------------
+New version, new tarball. Try 2 at mmcblk support. I had mmcblock, thats not how it's
+reported to the system.
+
+-----------------------------------
+-- Harald Hope - Sun, 15 Nov 2015 17:25:10 -0800
+
 =====================================================================================
 Version: 2.2.30
 Patch Version: 00