From 8e49fd378d4f555c8b2e310b26cc9f0b576ed17c Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 22 Jan 2024 20:03:29 +0100 Subject: [PATCH] Update install.sh --- src/install.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/install.sh b/src/install.sh index 6d7a33c..5cfd64f 100644 --- a/src/install.sh +++ b/src/install.sh @@ -106,14 +106,17 @@ if [ -f "$STORAGE/$BASE" ]; then MAGIC=$(dd if="$STORAGE/$BASE" seek=0 bs=1 count=1 status=none | tr -d '\000') MAGIC="$(printf '%s' "$MAGIC" | od -A n -t x1 -v | tr -d ' \n')" - if [[ "$MAGIC" == "16" ]] && [ -f "$STORAGE/windows.ver" ]; then + if [[ "$MAGIC" == "16" ]]; then FOUND="N" + [[ "$MANUAL" = [Yy1]* ]] && FOUND="Y" - if [ -f "$STORAGE/data.img" ] || [ -f "$STORAGE/data.qcow2" ]; then - FOUND="Y" - else - [ -b "${DEVICE:-}" ] && FOUND="Y" + if [[ "$FOUND" == "N" ]]; then + if [ -f "$STORAGE/data.img" ] || [ -f "$STORAGE/data.qcow2" ]; then + FOUND="Y" + else + [ -b "${DEVICE:-}" ] && FOUND="Y" + fi fi if [[ "$FOUND" == "Y" ]]; then