From d0853d65cf9e116bd88a842af1c6732a7d09637f Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Mon, 22 Jan 2024 15:00:10 +0100
Subject: [PATCH] fix: Custom ISO

---
 src/install.sh | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/install.sh b/src/install.sh
index d0f336a..24baf31 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -72,6 +72,14 @@ fi
 html "$MSG"
 
 CUSTOM="custom.iso"
+[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="custom.img"
+[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="Custom.iso"
+[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="Custom.img"
+[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="custom.ISO"
+[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="custom.IMG"
+[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="CUSTOM.ISO"
+[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="CUSTOM.IMG"
+
 TMP="$STORAGE/tmp"
 
 if [ -f "$STORAGE/$BASE" ]; then
@@ -95,14 +103,6 @@ mkdir -p "$TMP"
 ISO="$TMP/$BASE"
 rm -f "$ISO"
 
-[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="custom.img"
-[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="Custom.iso"
-[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="Custom.img"
-[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="custom.ISO"
-[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="custom.IMG"
-[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="CUSTOM.ISO"
-[ ! -f "$STORAGE/$CUSTOM" ] && CUSTOM="CUSTOM.IMG"
-
 if [ ! -f "$STORAGE/$CUSTOM" ]; then
   CUSTOM=""
 else
@@ -330,13 +330,6 @@ genisoimage -b "$ETFS" -no-emul-boot -c "$CAT" -iso-level 4 -J -l -D -N -joliet-
 # Mark ISO as prepared via magic byte
 printf '\x16' | dd of=$OUT bs=1 seek=0 count=1 conv=notrunc status=none
 
-echo "$BASE" > "$STORAGE/windows.ver"
-
-if [ -f "$ASSET" ]; then
-  rm -f "$STORAGE/windows.xml"
-  cp "$ASSET" "$STORAGE/windows.xml"
-fi
-
 [ -n "$CUSTOM" ] && rm -f "$STORAGE/$CUSTOM"
 
 if [ -f "$STORAGE/$BASE" ]; then
@@ -344,6 +337,14 @@ if [ -f "$STORAGE/$BASE" ]; then
 fi
 
 mv "$OUT" "$STORAGE/$BASE"
+
+echo "$BASE" > "$STORAGE/windows.ver"
+
+if [ -f "$ASSET" ]; then
+  rm -f "$STORAGE/windows.xml"
+  cp "$ASSET" "$STORAGE/windows.xml"
+fi
+
 rm -rf "$TMP"
 
 html "Successfully prepared image for installation..."