From 2f60dbafea57512ebbda84e12d6d471c7bc88726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Madis=20M=C3=A4gi?= <madis.magi@k-space.ee>
Date: Mon, 1 Mar 2021 08:25:04 +0200
Subject: [PATCH] Fix globs

---
 overlay/sbin/butterknife-provision | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/overlay/sbin/butterknife-provision b/overlay/sbin/butterknife-provision
index 02a8833..bd5bab6 100755
--- a/overlay/sbin/butterknife-provision
+++ b/overlay/sbin/butterknife-provision
@@ -71,7 +71,7 @@ case $BUTTERKNIFE_TRANSFER_METHOD in
                 echo -e "n\np\n\n\n\nw" | fdisk $BUTTERKNIFE_DISK
             ;;
             resize)
-                NTFS_PARTITION=$(ls $BUTTERKNIFE_DISK? | tail -n 1)
+                NTFS_PARTITION=$(ls $BUTTERKNIFE_DISK?* | tail -n 1)
                 # TODO: Assert last one is NTFS
                 # TODO: Suggested size heuristics
                 MINSIZE=$(ntfsresize $NTFS_PARTITION -m | grep Minsize | cut -d ':' -f 2)
@@ -113,7 +113,7 @@ case $BUTTERKNIFE_TRANSFER_METHOD in
         case $BUTTERKNIFE_PARTITIONING_METHOD in
             reformat|receive)
                 # Dialog to select partition for reformat or receive
-                for partition in $BUTTERKNIFE_DISK?; do
+                for partition in $BUTTERKNIFE_DISK?*; do
                     partition_slug=$(echo $BUTTERKNIFE_PARTITION | cut -d "/" -f 3)
                     sector_count=$(cat /sys/block/$bk_disk_slug/$BUTTERKNIFE_PARTITION_slug/size)
                     sector_size=$(cat /sys/block/$bk_disk_slug/queue/hw_sector_size)
@@ -132,7 +132,7 @@ case $BUTTERKNIFE_TRANSFER_METHOD in
             ;;
             unpartitioned|resize|mbr|gpt|efi)
                 # Assume last partition
-                BUTTERKNIFE_PARTITION=$(ls $BUTTERKNIFE_DISK? | tail -n 1)
+                BUTTERKNIFE_PARTITION=$(ls $BUTTERKNIFE_DISK?* | tail -n 1)
             ;;
             *)
                 echo "Invalid partitioning method $BUTTERKNIFE_PARTITIONING_METHOD"