From e19c1a42ddf51e4a5b9d2a712e199f7fba6a0e94 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Tue, 28 May 2024 11:13:54 +0200
Subject: [PATCH] Update install.sh

---
 src/install.sh | 39 ++++-----------------------------------
 1 file changed, 4 insertions(+), 35 deletions(-)

diff --git a/src/install.sh b/src/install.sh
index ddbff36..e19c6ac 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -584,39 +584,8 @@ prepareImage() {
 
   desc=$(printVersion "$DETECTED" "$DETECTED")
 
-  case "${DETECTED,,}" in
-    "win9"* | "win2k"* )
-      MACHINE="pc-i440fx-2.4" ;;
-    "winvistax86"* | "win7x86"* | "winxp"* | "win2003"* )
-      MACHINE="pc-q35-2.10" ;;
-  esac
-
-  case "${DETECTED,,}" in
-    "win9"* | "win2k"* | "winxp"* | "win2003"* )
-      HV="N"
-      BOOT_MODE="windows_legacy" ;;
-    "winvista"* | "win7"* | "win2008"* )
-      BOOT_MODE="windows_legacy" ;;
-  esac
-
-  case "${DETECTED,,}" in
-    "win9"* )
-      DISK_TYPE="auto"
-      ETFS="[BOOT]/Boot-1.44M.img"
-      return 0
-    "win2k"* )
-      DISK_TYPE="auto"
-      ETFS="[BOOT]/Boot-NoEmul.img"
-      return 0
-    "winxp"* )
-      DISK_TYPE="blk"
-      prepareXP "$iso" "$dir" "$desc" && return 0
-      error "Failed to prepare $desc ISO!" && return 1 ;;
-    "win2003"* )
-      DISK_TYPE="blk"
-      prepare2k3 "$iso" "$dir" "$desc" && return 0
-      error "Failed to prepare $desc ISO!" && return 1 ;;
-  esac
+  ! setMachine "$DETECTED" "$iso" "$dir" && return 1
+  skipVersion "$DETECTED" && return 0
 
   if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then
 
@@ -625,13 +594,13 @@ prepareImage() {
     missing=$(basename "$dir/$EFISYS")
     [ ! -f "$dir/$ETFS" ] && missing=$(basename "$dir/$ETFS")
 
-    error "Failed to locate file \"${missing,,}\" in $desc ISO image!"
+    error "Failed to locate file \"${missing,,}\" in ISO image!"
     return 1
   fi
 
   prepareLegacy "$iso" "$dir" "$desc" && return 0
 
-  error "Failed to extract boot image from $desc ISO image!"
+  error "Failed to extract boot image from ISO image!"
   return 1
 }