From 247d7c1f55ca676367382c90d1ed244f0f0c4af1 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 12 Jun 2024 22:58:16 +0200
Subject: [PATCH 1/3] Update disk.sh

---
 src/disk.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/disk.sh b/src/disk.sh
index 6e374b06..681da932 100644
--- a/src/disk.sh
+++ b/src/disk.sh
@@ -280,10 +280,10 @@ convertDisk() {
   isCow "$FS" && DISK_PARAM+=",nocow=on"
 
   if [[ "$DST_FMT" != "raw" ]]; then
-      if [[ "$ALLOCATE" == [Nn]* ]]; then
-        CONV_FLAGS+=" -c"
-      fi
-      [ -n "$DISK_FLAGS" ] && DISK_PARAM+=",$DISK_FLAGS"
+    if [[ "$ALLOCATE" == [Nn]* ]]; then
+      CONV_FLAGS+=" -c"
+    fi
+    [ -n "$DISK_FLAGS" ] && DISK_PARAM+=",$DISK_FLAGS"
   fi
 
   # shellcheck disable=SC2086
@@ -293,13 +293,13 @@ convertDisk() {
   fi
 
   if [[ "$DST_FMT" == "raw" ]]; then
-      if [[ "$ALLOCATE" != [Nn]* ]]; then
-        # Work around qemu-img bug
-        CUR_SIZE=$(stat -c%s "$TMP_FILE")
-        if ! fallocate -l "$CUR_SIZE" "$TMP_FILE"; then
-            error "Failed to allocate $CUR_SIZE bytes for $DISK_DESC image $TMP_FILE"
-        fi
+    if [[ "$ALLOCATE" != [Nn]* ]]; then
+      # Work around qemu-img bug
+      CUR_SIZE=$(stat -c%s "$TMP_FILE")
+      if ! fallocate -l "$CUR_SIZE" "$TMP_FILE"; then
+          error "Failed to allocate $CUR_SIZE bytes for $DISK_DESC image $TMP_FILE"
       fi
+    fi
   fi
 
   rm -f "$SOURCE_FILE"

From db8f2bd5ed90ad962d818d6c99e81588c38e7183 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Thu, 13 Jun 2024 11:12:23 +0200
Subject: [PATCH 2/3] Update disk.sh

---
 src/disk.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/disk.sh b/src/disk.sh
index 681da932..5eb6534a 100644
--- a/src/disk.sh
+++ b/src/disk.sh
@@ -422,12 +422,17 @@ addDisk () {
   DISK_SPACE=$(echo "${DISK_SPACE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
   DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
 
-  if (( DATA_SIZE < 6442450944 )); then
-    if (( DATA_SIZE < 1 )); then
+  if (( DATA_SIZE < 1 )); then
       error "Invalid value for ${DISK_DESC^^}_SIZE: $DISK_SPACE" && exit 73
-    else
+  fi
+
+  if (( DATA_SIZE < 1000 )); then
+    DISK_SPACE="${DISK_SPACE}G"
+    DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
+  fi
+
+  if (( DATA_SIZE < 6442450944 )); then
       error "Please increase ${DISK_DESC^^}_SIZE to at least 6 GB." && exit 73
-    fi
   fi
 
   FS=$(stat -f -c %T "$DIR")

From 758d67c1220d87583e828f7911cfefe8f3a00fa6 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Thu, 13 Jun 2024 18:57:55 +0200
Subject: [PATCH 3/3] Update disk.sh

---
 src/disk.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/disk.sh b/src/disk.sh
index 5eb6534a..8a22b1e5 100644
--- a/src/disk.sh
+++ b/src/disk.sh
@@ -420,17 +420,13 @@ addDisk () {
 
   [ -z "$DISK_SPACE" ] && DISK_SPACE="16G"
   DISK_SPACE=$(echo "${DISK_SPACE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
+  [[ -z "${DISK_SPACE//[0-9]}" ]] && DISK_SPACE="${DISK_SPACE}G"
   DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
 
   if (( DATA_SIZE < 1 )); then
       error "Invalid value for ${DISK_DESC^^}_SIZE: $DISK_SPACE" && exit 73
   fi
 
-  if (( DATA_SIZE < 1000 )); then
-    DISK_SPACE="${DISK_SPACE}G"
-    DATA_SIZE=$(numfmt --from=iec "$DISK_SPACE")
-  fi
-
   if (( DATA_SIZE < 6442450944 )); then
       error "Please increase ${DISK_DESC^^}_SIZE to at least 6 GB." && exit 73
   fi