From 606c98076944b87da11d08bf140a5428cd3e97da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 28 Sep 2018 22:14:10 +0200
Subject: [PATCH] sdcard-write: display more information when selecting card
 device
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Maybe that helps not to kill memory sticks...

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 scripts/sdcard-write/tools.inc | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/scripts/sdcard-write/tools.inc b/scripts/sdcard-write/tools.inc
index d16ebfa..8cd4b01 100644
--- a/scripts/sdcard-write/tools.inc
+++ b/scripts/sdcard-write/tools.inc
@@ -20,7 +20,6 @@ CheckPrerequisite() {
 # SelectCardDevice() creates a dialog to select one of all available removable
 # devices. The path to the selected device is stored in the variale DevicePath.
 SelectCardDevice() {
-	strSelection=""
 	iCount=0
 	for dev in /dev/sd[a-z] ; do
 		DeviceFile=`basename $dev`
@@ -28,7 +27,34 @@ SelectCardDevice() {
 		if [ `cat  /sys/block/$DeviceFile/removable` = '1' ] && [ `cat  /sys/block/$DeviceFile/size` -gt "0" ]; then
 			iCount=`expr $iCount + 1`
 			DevicePathArr[${iCount}]=$dev
-			strSelection="$strSelection $iCount $dev"
+            # pretify display
+            secondline=
+            display=
+            IFS=$'\n'
+            for line in `lsblk --raw --noheadings --output NAME,LABEL,MODEL $dev` ; do
+                # a bug in lsblk?
+                line=`echo $line | sed 's:\\\x20: :g'`
+                if [ "x$secondline" = "x" ]; then
+                    # first line - it is for device
+                    secondline="1"
+                    display="$line"
+                else
+                    if [ "x$secondline" = "x1" ]; then
+                        secondline="2"
+                        # second line - header + partition
+                        display="$display / partitions: $line"
+                    else
+                        # second line - separator + partition
+                        display="$display + $line"
+                    fi
+                fi
+            done
+            display=`echo $display | sed 's:  : :g'`
+            display=`echo $display | sed 's:  : :g'`
+            display=`echo $display | sed 's:  : :g'`
+            
+            unset IFS
+            menuitems+=( "$iCount" "$display" )
 		fi
 	done
 	
@@ -39,7 +65,7 @@ SelectCardDevice() {
 
 	dialog --title 'Select card device'\
 	--menu 'Move using [UP] [DOWN],[Enter] to select' 10 100 $iCount\
-	${strSelection}\
+	"${menuitems[@]}"\
 	2>/tmp/menuitem.$$
 
 	# get OK/Cancel
@@ -108,4 +134,5 @@ chk_root() {
 
 # common prerequisites
 CheckPrerequisite "dialog"
+CheckPrerequisite "lsblk"