From b1ca283ba8c464c60f941fa8b5b954e5525edeba Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 13 Nov 2024 13:07:17 +0100
Subject: [PATCH 01/14] build: Use latest ARM image

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f7252ce69..98089ef30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-ARG VERSION_ARG="4.00"
-
+ARG VERSION_ARG="latest"
 FROM scratch AS build-amd64
+
 COPY --from=qemux/qemu-docker:6.07 / /
 
 ARG DEBCONF_NOWARNINGS="yes"
@@ -34,7 +34,7 @@ ADD --chmod=664 https://github.com/qemus/virtiso-whql/releases/download/v1.9.43-
 FROM dockurr/windows-arm:${VERSION_ARG} AS build-arm64
 FROM build-${TARGETARCH}
 
-ARG VERSION_ARG="4.00"
+ARG VERSION_ARG="0.00"
 RUN echo "$VERSION_ARG" > /run/version
 
 VOLUME /storage

From 2ace98f46d494c3e8a086965f510be48ebea7823 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 15 Nov 2024 00:17:14 +0100
Subject: [PATCH 02/14] fix: Remove Windows 8.1 Pro

---
 src/define.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/define.sh b/src/define.sh
index a2706e3e0..3be4e4285 100644
--- a/src/define.sh
+++ b/src/define.sh
@@ -671,10 +671,6 @@ getMido() {
       size=4898582528
       sum="e4ab2e3535be5748252a8d5d57539a6e59be8d6726345ee10e7afd2cb89fefb5"
       ;;
-    "win81x64" )
-      size=4320526336
-      sum="d8333cf427eb3318ff6ab755eb1dd9d433f0e2ae43745312c1cd23e83ca1ce51"
-      ;;
     "win81x64-enterprise-eval" )
       size=3961473024
       sum="2dedd44c45646c74efc5a028f65336027e14a56f76686a4631cf94ffe37c72f2"

From c2012a9e329927de74f96a23c55d313371a8d9bb Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 15 Nov 2024 00:41:30 +0100
Subject: [PATCH 03/14] feat: Rework download code

---
 src/mido.sh | 119 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 77 insertions(+), 42 deletions(-)

diff --git a/src/mido.sh b/src/mido.sh
index d739553a7..a6a444bd6 100644
--- a/src/mido.sh
+++ b/src/mido.sh
@@ -57,36 +57,71 @@ get_agent() {
   return 0
 }
 
+convert_language() {
+
+  local lang=""
+
+  case "${1,,}" in
+    "gb" | "en-gb" )
+      lang="English International" ;;
+    "en" | "en-"* )
+      lang="English" ;;
+    "mx" | "es-mx" )
+      lang="Spanish (Mexico)" ;;
+    "ca" | "fr-ca" )
+      lang="French Canadian" ;;
+    "br" | "pt-br" )
+      lang="Brazilian Portuguese" ;;
+    "sr" | "sr-"* )
+      lang="Serbian Latin" ;;
+    "hk" | "zh-hk" | "cn-hk" )
+      lang="Chinese (Traditional)" ;;
+    "tw" | "zh-tw" | "cn-tw" )
+      lang="Chinese (Traditional)" ;;
+    "zh" | "zh-"* | "cn" | "cn-"* )
+      lang="Chinese (Simplified)" ;;
+    * )
+      lang=$(getLanguage "$1" "name") ;;
+  esac
+
+
+  echo "$lang"
+  return 0
+}
+
 download_windows() {
 
   local id="$1"
   local lang="$2"
   local desc="$3"
   local sku_id=""
+  local sku_url=""
+  local iso_url=""
+  local iso_json=""
   local language=""
   local session_id=""
   local user_agent=""
+  local download_type=""
   local windows_version=""
   local iso_download_link=""
+  local download_page_html=""
   local product_edition_id=""
-  local iso_download_link_html=""
-  local iso_download_page_html=""
-  local language_skuid_table_html=""
+  local language_skuid_json=""
+  local profile="606624d44113"
+
+  user_agent=$(get_agent)
+  language=$(convert_language "$lang")
+  [ -z "$language" ] && error "Invalid language: $lang" && return 1
 
   case "${id,,}" in
-    "win11x64" ) windows_version="11" ;;
-    "win10x64" ) windows_version="10" ;;
-    "win81x64" ) windows_version="8" ;;
+    "win11x64" ) windows_version="11" && download_type="1" ;;
+    "win10x64" ) windows_version="10" && download_type="1" ;;
+    "win11arm64" ) windows_version="11arm64" && download_type="2" ;;
     * ) error "Invalid VERSION specified, value \"$id\" is not recognized!" && return 1 ;;
   esac
 
-  user_agent=$(get_agent)
-  language=$(getLanguage "$lang" "name")
-
   local url="https://www.microsoft.com/en-us/software-download/windows$windows_version"
-  case "$windows_version" in
-    8 | 10) url+="ISO";;
-  esac
+  [[ "${id,,}" == "win10"* ]] && url+="ISO"
 
   # uuidgen: For MacOS (installed by default) and other systems (e.g. with no /proc) that don't have a kernel interface for generating random UUIDs
   session_id=$(cat /proc/sys/kernel/random/uuid 2> /dev/null || uuidgen --random)
@@ -96,44 +131,40 @@ download_windows() {
   # This is the *only* request we make that Fido doesn't. Fido manually maintains a list of all the Windows release/edition product edition IDs in its script (see: $WindowsVersions array). This is helpful for downloading older releases (e.g. Windows 10 1909, 21H1, etc.) but we always want to get the newest release which is why we get this value dynamically
   # Also, keeping a "$WindowsVersions" array like Fido does would be way too much of a maintenance burden
   # Remove "Accept" header that curl sends by default
-  [[ "$DEBUG" == [Yy1]* ]] && echo " - Parsing download page: ${url}"
-  iso_download_page_html=$(curl --silent --max-time 30 --user-agent "$user_agent" --header "Accept:" --max-filesize 1M --fail --proto =https --tlsv1.2 --http1.1 -- "$url") || {
+  [[ "$DEBUG" == [Yy1]* ]] && echo "Parsing download page: ${url}"
+  download_page_html=$(curl --silent --max-time 30 --user-agent "$user_agent" --header "Accept:" --max-filesize 1M --fail --proto =https --tlsv1.2 --http1.1 -- "$url") || {
     handle_curl_error $?
     return $?
   }
 
   [[ "$DEBUG" == [Yy1]* ]] && echo -n "Getting Product edition ID: "
-  # tr: Filter for only numerics to prevent HTTP parameter injection
-  # head -c was recently added to POSIX: https://austingroupbugs.net/view.php?id=407
-  product_edition_id=$(echo "$iso_download_page_html" | grep -Eo '<option value="[0-9]+">Windows' | cut -d '"' -f 2 | head -n 1 | tr -cd '0-9' | head -c 16)
+  product_edition_id=$(echo "$download_page_html" | grep -Eo '<option value="[0-9]+">Windows' | cut -d '"' -f 2 | head -n 1 | tr -cd '0-9' | head -c 16)
   [[ "$DEBUG" == [Yy1]* ]] && echo "$product_edition_id"
 
+  if [ -z "$product_edition_id" ]; then
+    error "Product edition ID not found!"
+    return 1
+  fi
+
+
   [[ "$DEBUG" == [Yy1]* ]] && echo "Permit Session ID: $session_id"
   # Permit Session ID
-  # "org_id" is always the same value
   curl --silent --max-time 30 --output /dev/null --user-agent "$user_agent" --header "Accept:" --max-filesize 100K --fail --proto =https --tlsv1.2 --http1.1 -- "https://vlscppe.microsoft.com/tags?org_id=y6jn8c31&session_id=$session_id" || {
     # This should only happen if there's been some change to how this API works
     handle_curl_error $?
     return $?
   }
 
-  # Extract everything after the last slash
-  local url_segment_parameter="${url##*/}"
-
   [[ "$DEBUG" == [Yy1]* ]] && echo -n "Getting language SKU ID: "
-  # Get language -> skuID association table
-  # SKU ID: This specifies the language of the ISO. We always use "English (United States)", however, the SKU for this changes with each Windows release
-  # We must make this request so our next one will be allowed
-  # --data "" is required otherwise no "Content-Length" header will be sent causing HTTP response "411 Length Required"
-  language_skuid_table_html=$(curl --silent --max-time 30 --request POST --user-agent "$user_agent" --data "" --header "Accept:" --max-filesize 10K --fail --proto =https --tlsv1.2 --http1.1 -- "https://www.microsoft.com/en-US/api/controls/contentinclude/html?pageId=a8f8f489-4c7f-463a-9ca6-5cff94d8d041&host=www.microsoft.com&segments=software-download,$url_segment_parameter&query=&action=getskuinformationbyproductedition&sessionId=$session_id&productEditionId=$product_edition_id&sdVersion=2") || {
+  sku_url="https://www.microsoft.com/software-download-connector/api/getskuinformationbyproductedition?profile=$profile&ProductEditionId=$product_edition_id&SKU=undefined&friendlyFileName=undefined&Locale=en-US&sessionID=$session_id"
+  language_skuid_json=$(curl --silent --max-time 30 --request GET --user-agent "$user_agent" --referer "$url" --header "Accept:" --max-filesize 100K --fail --proto =https --tlsv1.2 --http1.1 -- "$sku_url") || {
     handle_curl_error $?
     return $?
   }
 
-  # tr: Filter for only alphanumerics or "-" to prevent HTTP parameter injection
-  sku_id=$(echo "$language_skuid_table_html" | grep -m 1 ">${language}<" | sed 's/&quot;//g' | cut -d ',' -f 1  | cut -d ':' -f 2 | tr -cd '[:alnum:]-' | head -c 16)
+  { sku_id=$(echo "$language_skuid_json" | jq --arg LANG "$language" -r '.Skus[] | select(.Language==$LANG).Id') 2>/dev/null; rc=$?; } || :
 
-  if [ -z "$sku_id" ]; then
+  if [ -z "$sku_id" ] || [[ "${sku_id,,}" == "null" ]] || (( rc != 0 )); then
     language=$(getLanguage "$lang" "desc")
     error "No download in the $language language available for $desc!"
     return 1
@@ -144,28 +175,31 @@ download_windows() {
 
   # Get ISO download link
   # If any request is going to be blocked by Microsoft it's always this last one (the previous requests always seem to succeed)
-  # --referer: Required by Microsoft servers to allow request
-  iso_download_link_html=$(curl --silent --max-time 30 --request POST --user-agent "$user_agent" --data "" --referer "$url" --header "Accept:" --max-filesize 100K --fail --proto =https --tlsv1.2 --http1.1 -- "https://www.microsoft.com/en-US/api/controls/contentinclude/html?pageId=6e2a1789-ef16-4f27-a296-74ef7ef5d96b&host=www.microsoft.com&segments=software-download,$url_segment_parameter&query=&action=GetProductDownloadLinksBySku&sessionId=$session_id&skuId=$sku_id&language=English&sdVersion=2")
 
-  if ! [ "$iso_download_link_html" ]; then
+  iso_url="https://www.microsoft.com/software-download-connector/api/GetProductDownloadLinksBySku?profile=$profile&ProductEditionId=undefined&SKU=$sku_id&friendlyFileName=undefined&Locale=en-US&sessionID=$session_id"
+  iso_json=$(curl --silent --max-time 30 --request GET --user-agent "$user_agent" --referer "$url" --header "Accept:" --max-filesize 100K --fail --proto =https --tlsv1.2 --http1.1 -- "$iso_url")
+
+  if ! [ "$iso_json" ]; then
     # This should only happen if there's been some change to how this API works
     error "Microsoft servers gave us an empty response to our request for an automated download."
     return 1
   fi
 
-  if echo "$iso_download_link_html" | grep -q "We are unable to complete your request at this time."; then
+  if echo "$iso_json" | grep -q "Sentinel marked this request as rejected."; then
     error "Microsoft blocked the automated download request based on your IP address."
     return 1
   fi
 
-  # Filter for 64-bit ISO download URL
-  # sed: HTML decode "&" character
-  # tr: Filter for only alphanumerics or punctuation
-  iso_download_link=$(echo "$iso_download_link_html" | grep -o "https://software.download.prss.microsoft.com.*IsoX64" | cut -d '"' -f 1 | sed 's/&amp;/\&/g' | tr -cd '[:alnum:][:punct:]')
+  if echo "$iso_json" | grep -q "We are unable to complete your request at this time."; then
+    error "Microsoft blocked the automated download request based on your IP address."
+    return 1
+  fi
 
-  if ! [ "$iso_download_link" ]; then
-    # This should only happen if there's been some change to the download endpoint web address
+  { iso_download_link=$(echo "$iso_json" | jq --argjson TYPE "$download_type" -r '.ProductDownloadOptions[] | select(.DownloadType==$TYPE).Uri') 2>/dev/null; rc=$?; } || :
+
+  if [ -z "$iso_download_link" ] || [[ "${iso_download_link,,}" == "null" ]] || (( rc != 0 )); then
     error "Microsoft servers gave us no download link to our request for an automated download!"
+    info "Response: $iso_json"
     return 1
   fi
 
@@ -283,8 +317,8 @@ download_windows_eval() {
   [[ "$DEBUG" == [Yy1]* ]] && echo "Found download link: $iso_download_link"
 
   # Follow redirect so proceeding log message is useful
-  # This is a request we make this Fido doesn't
-  # We don't need to set "--max-filesize" here because this is a HEAD request and the output is to /dev/null anyway
+  # This is a request we make that Fido doesn't
+
   iso_download_link=$(curl --silent --max-time 30 --user-agent "$user_agent" --location --output /dev/null --silent --write-out "%{url_effective}" --head --fail --proto =https --tlsv1.2 --http1.1 -- "$iso_download_link") || {
     # This should only happen if the Microsoft servers are down
     handle_curl_error $?
@@ -317,6 +351,7 @@ getWindows() {
   esac
 
   case "${version,,}" in
+    "win11${PLATFORM,,}" ) ;;
     "win11${PLATFORM,,}-enterprise-iot"* ) ;;
     "win11${PLATFORM,,}-enterprise-ltsc"* ) ;;
     * )
@@ -327,7 +362,7 @@ getWindows() {
   esac
 
   case "${version,,}" in
-    "win81${PLATFORM,,}" | "win10${PLATFORM,,}" | "win11${PLATFORM,,}" )
+    "win10${PLATFORM,,}" | "win11${PLATFORM,,}" )
       download_windows "$version" "$lang" "$edition" && return 0
       ;;
     "win11${PLATFORM,,}-enterprise"* | "win10${PLATFORM,,}-enterprise"* )

From 5d7f4c9b6e973ec547b5b1dc6f9cff3c582f761b Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 15 Nov 2024 01:05:49 +0100
Subject: [PATCH 04/14] build: Add JQ

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 98089ef30..62b46ef32 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ RUN set -eu && \
     apt-get update && \
     apt-get --no-install-recommends -y install \
         bc \
+        jq \
         curl \
         7zip \
         wsdd \

From cea531cf3a4130839e090be1f4e3f5e28da54177 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 15 Nov 2024 01:11:13 +0100
Subject: [PATCH 05/14] Update define.sh

---
 src/define.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/define.sh b/src/define.sh
index 3be4e4285..642520d03 100644
--- a/src/define.sh
+++ b/src/define.sh
@@ -164,7 +164,7 @@ getLanguage() {
       desc="English"
       culture="en-GB" ;;
     "en" | "en-"* )
-      lang="English (United States)"
+      lang="English"
       desc="English"
       culture="en-US" ;;
     "mx" | "es-mx" )
@@ -280,15 +280,15 @@ getLanguage() {
       desc="$lang"
       culture="uk-UA" ;;
     "hk" | "zh-hk" | "cn-hk" )
-      lang="Chinese Traditional"
+      lang="Chinese (Traditional)"
       desc="Chinese HK"
       culture="zh-TW" ;;
     "tw" | "zh-tw" | "cn-tw" )
-      lang="Chinese Traditional"
+      lang="Chinese (Traditional)"
       desc="Chinese TW"
       culture="zh-TW" ;;
     "zh" | "zh-"* | "cn" | "cn-"* )
-      lang="Chinese Simplified"
+      lang="Chinese (Simplified)"
       desc="Chinese"
       culture="zh-CN" ;;
   esac

From a571ab69cd34d280f9fb93a03447bfdfd60fbd6f Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 15 Nov 2024 01:13:02 +0100
Subject: [PATCH 06/14] Update mido.sh

---
 src/mido.sh | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/src/mido.sh b/src/mido.sh
index a6a444bd6..36fbe2fa4 100644
--- a/src/mido.sh
+++ b/src/mido.sh
@@ -57,38 +57,6 @@ get_agent() {
   return 0
 }
 
-convert_language() {
-
-  local lang=""
-
-  case "${1,,}" in
-    "gb" | "en-gb" )
-      lang="English International" ;;
-    "en" | "en-"* )
-      lang="English" ;;
-    "mx" | "es-mx" )
-      lang="Spanish (Mexico)" ;;
-    "ca" | "fr-ca" )
-      lang="French Canadian" ;;
-    "br" | "pt-br" )
-      lang="Brazilian Portuguese" ;;
-    "sr" | "sr-"* )
-      lang="Serbian Latin" ;;
-    "hk" | "zh-hk" | "cn-hk" )
-      lang="Chinese (Traditional)" ;;
-    "tw" | "zh-tw" | "cn-tw" )
-      lang="Chinese (Traditional)" ;;
-    "zh" | "zh-"* | "cn" | "cn-"* )
-      lang="Chinese (Simplified)" ;;
-    * )
-      lang=$(getLanguage "$1" "name") ;;
-  esac
-
-
-  echo "$lang"
-  return 0
-}
-
 download_windows() {
 
   local id="$1"
@@ -110,8 +78,7 @@ download_windows() {
   local profile="606624d44113"
 
   user_agent=$(get_agent)
-  language=$(convert_language "$lang")
-  [ -z "$language" ] && error "Invalid language: $lang" && return 1
+  language=$(getLanguage "$lang" "name")
 
   case "${id,,}" in
     "win11x64" ) windows_version="11" && download_type="1" ;;

From 07de844831184cbe881f3fff1ab3b0c43b0fb5c6 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 15 Nov 2024 01:27:01 +0100
Subject: [PATCH 07/14] feat: Add Win8.1 Enterprise

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

diff --git a/src/define.sh b/src/define.sh
index 642520d03..53ddc03eb 100644
--- a/src/define.sh
+++ b/src/define.sh
@@ -762,6 +762,11 @@ getLink1() {
       sum="d8333cf427eb3318ff6ab755eb1dd9d433f0e2ae43745312c1cd23e83ca1ce51"
       url="8.x/8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso"
       ;;
+    "win81x64-enterprise" | "win81x64-enterprise-eval" )
+      size=111
+      sum="xxx"
+      url="8.x/8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso"
+      ;;
     "win2025" | "win2025-eval" )
       size=5307176960
       sum="2293897341febdcea599f5412300b470b5288c6fd2b89666a7b27d283e8d3cf3"

From 1f676331202719c74824843362bfb2990aded09e Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 15 Nov 2024 01:31:24 +0100
Subject: [PATCH 08/14] docs: Remove Win8.1 Pro

---
 readme.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/readme.md b/readme.md
index 1a7292395..f7ef33b46 100644
--- a/readme.md
+++ b/readme.md
@@ -102,8 +102,6 @@ kubectl apply -f https://raw.githubusercontent.com/dockur/windows/refs/heads/mas
   | `10`   | Windows 10 Pro           | 5.7 GB   |
   | `10l`  | Windows 10 LTSC          | 4.6 GB   |
   | `10e`  | Windows 10 Enterprise    | 5.2 GB   |
-  ||||
-  | `8`    | Windows 8.1 Pro          | 4.0 GB   |
   | `8e`   | Windows 8.1 Enterprise   | 3.7 GB   |
   | `7e`   | Windows 7 Enterprise     | 3.0 GB   |
   | `ve`   | Windows Vista Enterprise | 3.0 GB   |

From 654f7ebaa80e30c710e7babec65c3ae829357e98 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 15 Nov 2024 01:43:15 +0100
Subject: [PATCH 09/14] Update define.sh

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

diff --git a/src/define.sh b/src/define.sh
index 53ddc03eb..dd3678e45 100644
--- a/src/define.sh
+++ b/src/define.sh
@@ -763,8 +763,8 @@ getLink1() {
       url="8.x/8.1/en_windows_8.1_with_update_x64_dvd_6051480.iso"
       ;;
     "win81x64-enterprise" | "win81x64-enterprise-eval" )
-      size=111
-      sum="xxx"
+      size=4139163648
+      sum="c3c604c03677504e8905090a8ce5bb1dde76b6fd58e10f32e3a25bef21b2abe1"
       url="8.x/8.1/en_windows_8.1_enterprise_with_update_x64_dvd_6054382.iso"
       ;;
     "win2025" | "win2025-eval" )

From 0e9b0d9f2f294beb32fecab78aa662542f2e259c Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 15 Nov 2024 04:21:18 +0100
Subject: [PATCH 10/14] docs: Readme

---
 readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/readme.md b/readme.md
index f7ef33b46..ed9c71976 100644
--- a/readme.md
+++ b/readme.md
@@ -102,6 +102,7 @@ kubectl apply -f https://raw.githubusercontent.com/dockur/windows/refs/heads/mas
   | `10`   | Windows 10 Pro           | 5.7 GB   |
   | `10l`  | Windows 10 LTSC          | 4.6 GB   |
   | `10e`  | Windows 10 Enterprise    | 5.2 GB   |
+  ||||
   | `8e`   | Windows 8.1 Enterprise   | 3.7 GB   |
   | `7e`   | Windows 7 Enterprise     | 3.0 GB   |
   | `ve`   | Windows Vista Enterprise | 3.0 GB   |

From 45893f8ef419bc36bca0a395836340a11f2648e4 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 15 Nov 2024 04:28:58 +0100
Subject: [PATCH 11/14] build: Update qemu-docker to v6.08

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 62b46ef32..a610fbc3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 ARG VERSION_ARG="latest"
 FROM scratch AS build-amd64
 
-COPY --from=qemux/qemu-docker:6.07 / /
+COPY --from=qemux/qemu-docker:6.08 / /
 
 ARG DEBCONF_NOWARNINGS="yes"
 ARG DEBIAN_FRONTEND="noninteractive"

From 89f6eb64b62858183ed1297e72cec2ab1df12d98 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 15 Nov 2024 04:40:45 +0100
Subject: [PATCH 12/14] Update mido.sh

---
 src/mido.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/mido.sh b/src/mido.sh
index 36fbe2fa4..776f7168c 100644
--- a/src/mido.sh
+++ b/src/mido.sh
@@ -113,7 +113,6 @@ download_windows() {
     return 1
   fi
 
-
   [[ "$DEBUG" == [Yy1]* ]] && echo "Permit Session ID: $session_id"
   # Permit Session ID
   curl --silent --max-time 30 --output /dev/null --user-agent "$user_agent" --header "Accept:" --max-filesize 100K --fail --proto =https --tlsv1.2 --http1.1 -- "https://vlscppe.microsoft.com/tags?org_id=y6jn8c31&session_id=$session_id" || {

From 95ef20063ef5af0ca07d8e1a35577a9cf2afa855 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 15 Nov 2024 04:56:32 +0100
Subject: [PATCH 13/14] Update install.sh

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

diff --git a/src/install.sh b/src/install.sh
index b03f55a63..e22b99e5c 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -620,11 +620,11 @@ updateXML() {
   local language="$2"
   local culture region user admin pass keyboard
 
-  [ -z "$YRES" ] && YRES="720"
-  [ -z "$XRES" ] && XRES="1280"
+  [ -z "$HEIGHT" ] && HEIGHT="720"
+  [ -z "$WIDTH" ] && WIDTH="1280"
 
-  sed -i "s/<VerticalResolution>1080<\/VerticalResolution>/<VerticalResolution>$YRES<\/VerticalResolution>/g" "$asset"
-  sed -i "s/<HorizontalResolution>1920<\/HorizontalResolution>/<HorizontalResolution>$XRES<\/HorizontalResolution>/g" "$asset"
+  sed -i "s/<VerticalResolution>1080<\/VerticalResolution>/<VerticalResolution>$HEIGHT<\/VerticalResolution>/g" "$asset"
+  sed -i "s/<HorizontalResolution>1920<\/HorizontalResolution>/<HorizontalResolution>$WIDTH<\/HorizontalResolution>/g" "$asset"
 
   culture=$(getLanguage "$language" "culture")
 

From 1a46e733c4639627c6693b9dc63fcd84ff13f6c7 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 15 Nov 2024 05:03:06 +0100
Subject: [PATCH 14/14] Update define.sh

---
 src/define.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/define.sh b/src/define.sh
index dd3678e45..00fe997f1 100644
--- a/src/define.sh
+++ b/src/define.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-: "${XRES:=""}"
-: "${YRES:=""}"
+: "${WIDTH:=""}"
+: "${HEIGHT:=""}"
 : "${VERIFY:=""}"
 : "${REGION:=""}"
 : "${MANUAL:=""}"
@@ -2123,11 +2123,11 @@ prepareInstall() {
   local install="$dir/\$OEM\$/\$1/OEM/install.bat"
   [ -f "$install" ] && oem="\"Script\"=\"cmd /C start \\\"Install\\\" \\\"cmd /C C:\\\\OEM\\\\install.bat\\\"\""
 
-  [ -z "$YRES" ] && YRES="720"
-  [ -z "$XRES" ] && XRES="1280"
+  [ -z "$WIDTH" ] && WIDTH="1280"
+  [ -z "$HEIGHT" ] && HEIGHT="720"
 
-  XHEX=$(printf '%x\n' "$XRES")
-  YHEX=$(printf '%x\n' "$YRES")
+  XHEX=$(printf '%x\n' "$WIDTH")
+  YHEX=$(printf '%x\n' "$HEIGHT")
 
   local username="Docker"
   local password="*"
@@ -2179,8 +2179,8 @@ prepareInstall() {
           echo ""
           echo "[Display]"
           echo "    BitsPerPel=32"
-          echo "    XResolution=$XRES"
-          echo "    YResolution=$YRES"
+          echo "    XResolution=$WIDTH"
+          echo "    YResolution=$HEIGHT"
           echo ""
           echo "[Networking]"
           echo "    InstallDefaultComponents=Yes"