From 3b7e2373f735a85c9135ca37277cb5046dfdeb85 Mon Sep 17 00:00:00 2001 From: Kroese Date: Thu, 9 May 2024 15:47:46 +0200 Subject: [PATCH] feat: Store installation type (#476) --- src/install.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/install.sh b/src/install.sh index 6f4d81c..398c77b 100644 --- a/src/install.sh +++ b/src/install.sh @@ -33,8 +33,6 @@ startInstall() { html "Starting Windows..." - [ -z "$MANUAL" ] && MANUAL="N" - if [ -n "$CUSTOM" ]; then ISO="$CUSTOM" @@ -62,10 +60,13 @@ startInstall() { if [ -f "$ISO" ] && [ -s "$ISO" ]; then # Check if the ISO was already processed by our script - local magic="" + local magic + local byte="16" + [[ "$MANUAL" == [Yy1]* ]] && byte="17" magic=$(dd if="$ISO" seek=0 bs=1 count=1 status=none | tr -d '\000') magic="$(printf '%s' "$magic" | od -A n -t x1 -v | tr -d ' \n')" - [[ "$magic" == "16" ]] && return 1 + + [[ "$magic" == "$byte" ]] && return 1 fi @@ -106,7 +107,9 @@ finishInstall() { if [ -w "$iso" ] && [[ "$aborted" != [Yy1]* ]]; then # Mark ISO as prepared via magic byte - if ! printf '\x16' | dd of="$iso" bs=1 seek=0 count=1 conv=notrunc status=none; then + local byte="\x16" + [[ "$MANUAL" == [Yy1]* ]] && byte="\x17" + if ! printf "$byte" | dd of="$iso" bs=1 seek=0 count=1 conv=notrunc status=none; then error "Failed to set magic byte in ISO file: $iso" && return 1 fi fi