From 215eec7d1e200a8fd065d4f5178d098c36933cf8 Mon Sep 17 00:00:00 2001 From: Kroese Date: Tue, 30 Apr 2024 16:06:24 +0200 Subject: [PATCH] Update install.sh --- src/install.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/install.sh b/src/install.sh index 41fedd1..b771e78 100644 --- a/src/install.sh +++ b/src/install.sh @@ -529,6 +529,7 @@ extractImage() { detectImage() { XML="" + local dsc local dir="$1" if [ -n "$CUSTOM" ]; then @@ -548,7 +549,6 @@ detectImage() { if [[ "${DETECTED,,}" != "winxp"* ]]; then - local dsc dsc=$(printVersion "$DETECTED" "$DETECTED") warn "got $dsc, but no matching file called $DETECTED.xml exists, $FB." @@ -561,8 +561,14 @@ detectImage() { if [[ "${PLATFORM,,}" == "x64" ]]; then if [ -f "$dir/WIN51" ] || [ -f "$dir/SETUPXP.HTM" ]; then - DETECTED="winxpx86" - info "Detected: Windows XP" && return 0 + if [ -d "$dir/AMD64" ]; then + DETECTED="winxpx64" + else + DETECTED="winxpx86" + fi + dsc=$(printVersion "$DETECTED" "$DETECTED") + info "Detected: $dsc" + return 0 fi fi