From 8fbbebdd1e9014d66f0b32c0903d6c001299285d Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Mon, 17 Feb 2025 18:09:18 +0100
Subject: [PATCH 1/3] feat: Detect Optimum builds

---
 src/define.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/define.sh b/src/define.sh
index 32ce96bcc..b4d040a1e 100644
--- a/src/define.sh
+++ b/src/define.sh
@@ -593,7 +593,9 @@ fromName() {
     *"windows 7"* ) id="win7${arch}" ;;
     *"windows 8"* ) id="win81${arch}" ;;
     *"windows 10"* ) id="win10${arch}" ;;
+    *"optimum 10"* ) id="win10${arch}" ;;
     *"windows 11"* ) id="win11${arch}" ;;
+    *"optimum 11"* ) id="win11${arch}" ;;
     *"windows vista"* ) id="winvista${arch}" ;;
     *"server 2025"* ) id="win2025${add}" ;;
     *"server 2022"* ) id="win2022${add}" ;;

From 21918adbf031342facaae14f89df4ed6997e7f87 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Mon, 17 Feb 2025 18:28:21 +0100
Subject: [PATCH 2/3] feat: Fallback to Windows 11 if version unknown

---
 src/install.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/install.sh b/src/install.sh
index fcbf8ef39..38f537fb7 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -680,8 +680,13 @@ addDriver() {
   local path="$2"
   local target="$3"
   local driver="$4"
+  local desc=""
   local folder=""
 
+  if [ -z "$id" ]; then
+    warn "no Windows version specified for \"$driver\" driver!" && return 0
+  fi
+
   case "${id,,}" in
     "win7x86"* ) folder="w7/x86" ;;
     "win7x64"* ) folder="w7/amd64" ;;
@@ -701,7 +706,8 @@ addDriver() {
   esac
 
   if [ -z "$folder" ]; then
-    warn "no \"$driver\" driver found for \"$DETECTED\" !" && return 0
+    desc=$(printVersion "$id" "$id")
+    warn "no \"$driver\" driver available for \"$desc\" !" && return 0
   fi
 
   [ ! -d "$path/$driver/$folder" ] && return 0
@@ -728,6 +734,11 @@ addDrivers() {
   local version="$5"
   local drivers="$tmp/drivers"
 
+  if [ -z "$version" ]; then
+    version="win11x64"
+    warn "Windows version unknown, falling back to Windows 11 drivers..."
+  fi
+
   rm -rf "$drivers"
   mkdir -p "$drivers"
 

From f2a922e0e181a58a9aceb026d49456cb431f91a1 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Mon, 17 Feb 2025 18:34:54 +0100
Subject: [PATCH 3/3] feat: Fallback to Windows 11 if version unknown

---
 src/install.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/install.sh b/src/install.sh
index 38f537fb7..7f10eec06 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -734,17 +734,17 @@ addDrivers() {
   local version="$5"
   local drivers="$tmp/drivers"
 
-  if [ -z "$version" ]; then
-    version="win11x64"
-    warn "Windows version unknown, falling back to Windows 11 drivers..."
-  fi
-
   rm -rf "$drivers"
   mkdir -p "$drivers"
 
   local msg="Adding drivers to image..."
   info "$msg" && html "$msg"
 
+  if [ -z "$version" ]; then
+    version="win11x64"
+    warn "Windows version unknown, falling back to Windows 11 drivers..."
+  fi
+
   if ! bsdtar -xf /drivers.txz -C "$drivers"; then
     error "Failed to extract drivers from archive!" && return 1
   fi