From 24c01a0d18a1d0a6013b482d843b71a28bf983ea Mon Sep 17 00:00:00 2001
From: DimitrisPa <pappasdimitris98@gmail.com>
Date: Thu, 1 Dec 2022 14:48:09 +0200
Subject: [PATCH 01/36] NixOS-22.11 released

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

diff --git a/quickget b/quickget
index 1abb77f..e627da6 100755
--- a/quickget
+++ b/quickget
@@ -422,7 +422,7 @@ function releases_netbsd() {
 }
 
 function releases_nixos(){
-    echo 21.05 21.11 22.05
+    echo 21.05 21.11 22.05 22.11
 }
 
 function editions_nixos(){

From 332f5b59f902e6bc866cdf5bd0b01cb348322183 Mon Sep 17 00:00:00 2001
From: Dani Llewellyn <diddledani@ubuntu.com>
Date: Mon, 17 Oct 2022 20:22:46 +0100
Subject: [PATCH 02/36] Revert "Defaults: Switch default disk from
 virtio-blk-pci to virtio-scsi-pci"

This reverts commit fb8deb10e8dab766696c173fd10a58d0749841ab.
---
 quickemu | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/quickemu b/quickemu
index b9440c8..943d751 100755
--- a/quickemu
+++ b/quickemu
@@ -1104,9 +1104,8 @@ function vm_boot() {
 
   else
     # shellcheck disable=SC2054,SC2206
-    args+=(-device virtio-scsi-pci,id=scsi0
-          -device scsi-hd,drive=SystemDisk,bus=scsi0.0,lun=0,rotation_rate=1
-          -drive id=SystemDisk,if=none,format=qcow2,discard=unmap,file="${disk_img}" ${STATUS_QUO})
+    args+=(-device virtio-blk-pci,drive=SystemDisk
+           -drive id=SystemDisk,if=none,format=qcow2,file="${disk_img}" ${STATUS_QUO})
   fi
 
   # https://wiki.qemu.org/Documentation/9psetup

From 9a7ee718047aece5b7600307e33dcc88251a9921 Mon Sep 17 00:00:00 2001
From: Dani Llewellyn <diddledani@ubuntu.com>
Date: Mon, 17 Oct 2022 20:25:42 +0100
Subject: [PATCH 03/36] Revert "macOS: swap disk controller from virtio-blk-pci
 to ahci"

This reverts commit 881adb289a820e0b72ee5f2a81ae3461b96e07c8.
---
 quickemu | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/quickemu b/quickemu
index 943d751..fb4dd53 100755
--- a/quickemu
+++ b/quickemu
@@ -542,13 +542,13 @@ function vm_boot() {
       case ${macos_release} in
         catalina)
           BALLOON=""
-          MAC_DISK_DEV="ide-hd,bus=ahci.2"
+          MAC_DISK_DEV="virtio-blk-pci"
           NET_DEVICE="vmxnet3"
           USB_HOST_PASSTHROUGH_CONTROLLER="usb-ehci"
           ;;
         big-sur|monterey|ventura)
           BALLOON="-device virtio-balloon"
-          MAC_DISK_DEV="ide-hd,bus=ahci.2"
+          MAC_DISK_DEV="virtio-blk-pci"
           NET_DEVICE="virtio-net"
           USB_HOST_PASSTHROUGH_CONTROLLER="nec-usb-xhci"
           GUEST_TWEAKS="${GUEST_TWEAKS} -global nec-usb-xhci.msi=off"
@@ -1071,19 +1071,18 @@ function vm_boot() {
   if [ "${guest_os}" == "macos" ]; then
     # shellcheck disable=SC2054
     args+=(-device ahci,id=ahci
-           -device ide-hd,bus=ahci.0,drive=BootLoader,bootindex=0,rotation_rate=1
-           -drive id=BootLoader,if=none,format=qcow2,discard=unmap,file="${MAC_BOOTLOADER}")
+           -device ide-hd,bus=ahci.0,drive=BootLoader,bootindex=0
+           -drive id=BootLoader,if=none,format=qcow2,file="${MAC_BOOTLOADER}")
 
     if [ -n "${img}" ]; then
       # shellcheck disable=SC2054
-      args+=(-device ide-hd,bus=ahci.1,drive=RecoveryImage,rotation_rate=1
-             -drive id=RecoveryImage,if=none,format=raw,discard=unmap,file="${img}")
+      args+=(-device ide-hd,bus=ahci.1,drive=RecoveryImage
+             -drive id=RecoveryImage,if=none,format=raw,file="${img}")
     fi
 
     # shellcheck disable=SC2054,SC2206
-    args+=(-device ${MAC_DISK_DEV},drive=SystemDisk,rotation_rate=1
-           -drive id=SystemDisk,if=none,format=qcow2,discard=unmap,file="${disk_img}" ${STATUS_QUO})
-
+    args+=(-device ${MAC_DISK_DEV},drive=SystemDisk
+           -drive id=SystemDisk,if=none,format=qcow2,file="${disk_img}" ${STATUS_QUO})
   elif [ "${guest_os}" == "kolibrios" ]; then
     # shellcheck disable=SC2054,SC2206
     args+=(-device ahci,id=ahci

From 28b549c886009eaf3b37897755b2db74d386eab8 Mon Sep 17 00:00:00 2001
From: Dani Llewellyn <diddledani@ubuntu.com>
Date: Mon, 17 Oct 2022 20:48:31 +0100
Subject: [PATCH 04/36] Revert "README.md: drop mention of VirtIO Block Media
 in macOS docs"

This reverts commit 6f3bc41750b0787adc4078b60bdf2002be0bb252.
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index c6866cf..c282643 100644
--- a/README.md
+++ b/README.md
@@ -405,6 +405,9 @@ There are some considerations when running macOS via Quickemu.
 -   Optimised by default, but no GPU acceleration is available.
     -   Host CPU vendor is detected and guest CPU is optimised
         accordingly.
+    -   [VirtIO Block
+        Media](https://www.kraxel.org/blog/2019/06/macos-qemu-guest/) is
+        used for the system disk where supported.
     -   [VirtIO `usb-tablet`](http://philjordan.eu/osx-virt/) is used
         for the mouse.
     -   VirtIO Network (`virtio-net`) is supported and enabled on macOS

From d13509b5a7dcc175c2eb5fc8620237734ce88a2c Mon Sep 17 00:00:00 2001
From: Martin Wimpress <code@flexion.org>
Date: Sun, 11 Dec 2022 20:47:44 +0000
Subject: [PATCH 05/36] Bump version to 4.5

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

diff --git a/quickemu b/quickemu
index fb4dd53..31471ea 100755
--- a/quickemu
+++ b/quickemu
@@ -1498,7 +1498,7 @@ EXTRA_ARGS=""
 # shellcheck disable=SC2155
 readonly LAUNCHER=$(basename "${0}")
 readonly DISK_MIN_SIZE=$((197632 * 8))
-readonly VERSION="4.4"
+readonly VERSION="4.5"
 
 # TODO: Make this run the native architecture binary
 QEMU=$(command -v qemu-system-x86_64)

From c3d21b902944961fb144d5b8c27831522e0a0ca1 Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Sun, 11 Dec 2022 22:24:36 +0000
Subject: [PATCH 06/36] docs: Regenerated man pages for 4.5

---
 build-docs              | 2 +-
 docs/quickemu.1         | 8 +++++++-
 docs/quickemu.1.md      | 6 +++++-
 docs/quickemu_conf.1    | 2 +-
 docs/quickemu_conf.1.md | 2 +-
 docs/quickget.1         | 8 +++++++-
 docs/quickget.1.md      | 6 +++++-
 7 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/build-docs b/build-docs
index 83f2eab..297a1d4 160000
--- a/build-docs
+++ b/build-docs
@@ -1 +1 @@
-Subproject commit 83f2eab64f307de03be0f4ed5860c76f7883b7a7
+Subproject commit 297a1d4403ca0ddda062fdd086f4a00c8357452e
diff --git a/docs/quickemu.1 b/docs/quickemu.1
index 0226a81..9ee81fa 100644
--- a/docs/quickemu.1
+++ b/docs/quickemu.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKEMU" "1" "October 21, 2022" "quickemu" "Quickemu User Manual"
+.TH "QUICKEMU" "1" "December 11, 2022" "quickemu" "Quickemu User Manual"
 .hy
 .SH NAME
 .PP
@@ -324,6 +324,8 @@ All the official Ubuntu flavours are supported, just replace
 .IP \[bu] 2
 \f[V]ubuntu\f[R] (Ubuntu)
 .IP \[bu] 2
+\f[V]ubuntu-unity\f[R] (Ubuntu Unity)
+.IP \[bu] 2
 \f[V]xubuntu\f[R] (Xubuntu)
 .SS Other Operating Systems
 .PP
@@ -609,6 +611,10 @@ Optimised by default, but no GPU acceleration is available.
 .IP \[bu] 2
 Host CPU vendor is detected and guest CPU is optimised accordingly.
 .IP \[bu] 2
+VirtIO Block
+Media (https://www.kraxel.org/blog/2019/06/macos-qemu-guest/) is used
+for the system disk where supported.
+.IP \[bu] 2
 VirtIO \f[V]usb-tablet\f[R] (http://philjordan.eu/osx-virt/) is used for
 the mouse.
 .IP \[bu] 2
diff --git a/docs/quickemu.1.md b/docs/quickemu.1.md
index 15a0b3c..a26e3d8 100644
--- a/docs/quickemu.1.md
+++ b/docs/quickemu.1.md
@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: October 21, 2022
+date: December 11, 2022
 footer: quickemu
 header: Quickemu User Manual
 section: 1
@@ -250,6 +250,7 @@ with your preferred flavour.
 -   `ubuntu-mate` (Ubuntu MATE)
 -   `ubuntustudio` (Ubuntu Studio)
 -   `ubuntu` (Ubuntu)
+-   `ubuntu-unity` (Ubuntu Unity)
 -   `xubuntu` (Xubuntu)
 
 ## Other Operating Systems
@@ -434,6 +435,9 @@ There are some considerations when running macOS via Quickemu.
 -   Optimised by default, but no GPU acceleration is available.
     -   Host CPU vendor is detected and guest CPU is optimised
         accordingly.
+    -   [VirtIO Block
+        Media](https://www.kraxel.org/blog/2019/06/macos-qemu-guest/) is
+        used for the system disk where supported.
     -   [VirtIO `usb-tablet`](http://philjordan.eu/osx-virt/) is used
         for the mouse.
     -   VirtIO Network (`virtio-net`) is supported and enabled on macOS
diff --git a/docs/quickemu_conf.1 b/docs/quickemu_conf.1
index 7dc6c23..ee910b1 100644
--- a/docs/quickemu_conf.1
+++ b/docs/quickemu_conf.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKEMU_CONF" "1" "October 21, 2022" "quickemu_conf" "Quickemu Configuration Manual"
+.TH "QUICKEMU_CONF" "1" "December 11, 2022" "quickemu_conf" "Quickemu Configuration Manual"
 .hy
 .SH NAME
 .PP
diff --git a/docs/quickemu_conf.1.md b/docs/quickemu_conf.1.md
index 09b9a31..2305dd5 100644
--- a/docs/quickemu_conf.1.md
+++ b/docs/quickemu_conf.1.md
@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: October 21, 2022
+date: December 11, 2022
 footer: quickemu_conf
 header: Quickemu Configuration Manual
 section: 1
diff --git a/docs/quickget.1 b/docs/quickget.1
index 4e5fd85..bf6d0bb 100644
--- a/docs/quickget.1
+++ b/docs/quickget.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKGET" "1" "October 21, 2022" "quickget" "Quickget User Manual"
+.TH "QUICKGET" "1" "December 11, 2022" "quickget" "Quickget User Manual"
 .hy
 .SH NAME
 .PP
@@ -106,6 +106,8 @@ All the official Ubuntu flavours are supported, just replace
 .IP \[bu] 2
 \f[V]ubuntu\f[R] (Ubuntu)
 .IP \[bu] 2
+\f[V]ubuntu-unity\f[R] (Ubuntu Unity)
+.IP \[bu] 2
 \f[V]xubuntu\f[R] (Xubuntu)
 .SS Other Operating Systems
 .PP
@@ -391,6 +393,10 @@ Optimised by default, but no GPU acceleration is available.
 .IP \[bu] 2
 Host CPU vendor is detected and guest CPU is optimised accordingly.
 .IP \[bu] 2
+VirtIO Block
+Media (https://www.kraxel.org/blog/2019/06/macos-qemu-guest/) is used
+for the system disk where supported.
+.IP \[bu] 2
 VirtIO \f[V]usb-tablet\f[R] (http://philjordan.eu/osx-virt/) is used for
 the mouse.
 .IP \[bu] 2
diff --git a/docs/quickget.1.md b/docs/quickget.1.md
index c307883..50a5e35 100644
--- a/docs/quickget.1.md
+++ b/docs/quickget.1.md
@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: October 21, 2022
+date: December 11, 2022
 footer: quickget
 header: Quickget User Manual
 section: 1
@@ -82,6 +82,7 @@ with your preferred flavour.
 -   `ubuntu-mate` (Ubuntu MATE)
 -   `ubuntustudio` (Ubuntu Studio)
 -   `ubuntu` (Ubuntu)
+-   `ubuntu-unity` (Ubuntu Unity)
 -   `xubuntu` (Xubuntu)
 
 ## Other Operating Systems
@@ -266,6 +267,9 @@ There are some considerations when running macOS via Quickemu.
 -   Optimised by default, but no GPU acceleration is available.
     -   Host CPU vendor is detected and guest CPU is optimised
         accordingly.
+    -   [VirtIO Block
+        Media](https://www.kraxel.org/blog/2019/06/macos-qemu-guest/) is
+        used for the system disk where supported.
     -   [VirtIO `usb-tablet`](http://philjordan.eu/osx-virt/) is used
         for the mouse.
     -   VirtIO Network (`virtio-net`) is supported and enabled on macOS

From 23982c3f9da2c99d3fae333a0c6e89677bded499 Mon Sep 17 00:00:00 2001
From: Donny Kurnia <donnykurnia@gmail.com>
Date: Wed, 14 Dec 2022 17:20:15 +0700
Subject: [PATCH 07/36] use long hv-* attributes for qemu 6.0.0

---
 quickemu | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/quickemu b/quickemu
index 31471ea..3cb2e87 100755
--- a/quickemu
+++ b/quickemu
@@ -568,7 +568,11 @@ function vm_boot() {
       fi
       ;;
     windows)
-      CPU="-cpu host,kvm=on,+hypervisor,+invtsc,l3-cache=on,migratable=no,hv_passthrough"
+      if [ "${QEMU_VER_SHORT}" -gt 60 ]; then
+        CPU="-cpu host,kvm=on,+hypervisor,+invtsc,l3-cache=on,migratable=no,hv_passthrough"
+      else
+        CPU="-cpu host,kvm=on,+hypervisor,+invtsc,l3-cache=on,migratable=no,hv_frequencies,kvm_pv_unhalt,hv_reenlightenment,hv_relaxed,hv_spinlocks=8191,hv_stimer,hv_synic,hv_time,hv_vapic,hv_vendor_id=1234567890ab,hv_vpindex"
+      fi
       if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then
         CPU="${CPU},topoext"
       fi

From 9c9dcf65c0c3f8580c96465d4a8aa83545f9c384 Mon Sep 17 00:00:00 2001
From: DimitrisPa <pappasdimitris98@gmail.com>
Date: Mon, 19 Dec 2022 15:25:30 +0200
Subject: [PATCH 08/36] Linux Mint 22.1 released

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

diff --git a/quickget b/quickget
index e627da6..2ec5584 100755
--- a/quickget
+++ b/quickget
@@ -377,7 +377,7 @@ function releases_kolibrios() {
 }
 
 function releases_linuxmint(){
-    echo 20.2 20.3 21
+    echo 20.2 20.3 21 21.1
 }
 
 function editions_linuxmint(){

From 4b1bb51c5554d6f8f9abc33b25725f7b8a41f2ee Mon Sep 17 00:00:00 2001
From: George Sokianos <walkero@gmail.com>
Date: Fri, 23 Dec 2022 20:59:49 +0000
Subject: [PATCH 09/36] Added Haiku r1beta4

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

diff --git a/quickget b/quickget
index 2ec5584..3b5c7ad 100755
--- a/quickget
+++ b/quickget
@@ -357,7 +357,7 @@ function editions_ghostbsd() {
 }
 
 function releases_haiku() {
-    echo r1beta3
+    echo r1beta3 r1beta4
 }
 
 function editions_haiku() {

From e64f54ad52cfa1fc0799b2d3d808f2863e00e9f0 Mon Sep 17 00:00:00 2001
From: goosepirate <71612256+goosepirate@users.noreply.github.com>
Date: Sat, 24 Dec 2022 00:00:40 -0500
Subject: [PATCH 10/36] Allocate 32G disk_size to popos

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

diff --git a/quickget b/quickget
index 3b5c7ad..c3e6276 100755
--- a/quickget
+++ b/quickget
@@ -779,7 +779,7 @@ EOF
 
         # OS specific tweaks
         case ${OS} in
-          alma|centos-stream|oraclelinux|rockylinux)
+          alma|centos-stream|oraclelinux|popos|rockylinux)
             echo "disk_size=\"32G\"" >> "${CONF_FILE}";;
           batocera)
             echo "disk_size=\"8G\"" >> "${CONF_FILE}";;

From d2a7eff80e2000d75a807ce9da28f7da90126d54 Mon Sep 17 00:00:00 2001
From: TenTypekMatus <119664251+TenTypekMatus@users.noreply.github.com>
Date: Thu, 29 Dec 2022 11:46:17 +0100
Subject: [PATCH 11/36] Update quickget

---
 quickget | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/quickget b/quickget
index c3e6276..1f810dd 100755
--- a/quickget
+++ b/quickget
@@ -67,6 +67,7 @@ function pretty_name() {
     ubuntu-unity)       PRETTY_NAME="Ubuntu Unity";;
     void)               PRETTY_NAME="Void Linux";;
     zorin)              PRETTY_NAME="Zorin OS";;
+    truenas)            PRETTY_NAME="TrueNAS";;
     *)                  PRETTY_NAME="${SIMPLE_NAME^}";;
   esac
   echo "${PRETTY_NAME}"
@@ -204,6 +205,7 @@ function os_support() {
     slackware \
     solus \
     tails \
+    truenas \
     ubuntu \
     ubuntu-budgie \
     ubuntukylin \
@@ -480,6 +482,14 @@ function releases_tails() {
     echo stable
 }
 
+function editions_truenas() {
+    echo core scale # enterprise is proprietary and paid
+}
+
+function releases_truenas() {
+
+}
+
 function releases_ubuntu() {
     local LTS_SUPPORT="14.04 16.04 18.04 20.04 22.04"
     local INTERIM_SUPPORT="22.10"

From 66c5ff86b73c1548a8b8635f4942378d545c6fe3 Mon Sep 17 00:00:00 2001
From: Matus Mastena <Shadiness9530@proton.me>
Date: Thu, 29 Dec 2022 12:29:32 +0100
Subject: [PATCH 12/36] Added initial support for TrueNAS

---
 quickget | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/quickget b/quickget
index 1f810dd..092a339 100755
--- a/quickget
+++ b/quickget
@@ -487,7 +487,7 @@ function editions_truenas() {
 }
 
 function releases_truenas() {
-
+    echo 22.12 13.0
 }
 
 function releases_ubuntu() {
@@ -759,6 +759,9 @@ function make_vm_config() {
         reactos)
             GUEST="reactos"
             IMAGE_TYPE="iso";;
+        truenas)
+            GUEST="truenas"
+            IMAGE_TYPE="iso";;
         windows)
             GUEST="windows"
             IMAGE_TYPE="iso";;
@@ -809,6 +812,13 @@ EOF
             echo "disk_size=\"2G\"" >> "${CONF_FILE}"
             echo "ram=\"128M\"" >> "${CONF_FILE}"
             ;;
+          truenas)
+            echo 
+            echo "boot=\"legacy\"" >> "${CONF_FILE}"
+            echo "bootdrive_size=\"5G\"" >> "${CONF_FILE}" # boot drive
+            echo "1stdrive_size=\"20G\"" >> "${CONF_FILE}" # for testing
+            echo "2nddrive_size=\"20G\"" >> "${CONF_FILE}" # again, for testing
+            ;;
           zorin)
             case  ${EDITION} in
               education64|edulite64)
@@ -1453,6 +1463,18 @@ function get_tails() {
     echo "${URL} ${HASH}"
 }
 
+function get_truenas() {
+    local ISO=""
+    local URL=""
+
+    if [[ "${RELEASE}" == "13.0"* ]] && [ "${OS}" == "CORE" ]; then
+    URL="$(wget https://download.freenas.org/13.0/STABLE/U3.1/x64/${OS}.iso)"
+    
+    elif [[ "${RELEASE}" == "22.12"]] && [ "${OS}" == "SCALE"]; then
+    URL="$(https://download.truenas.com/TrueNAS-SCALE-Bluefin/${RELEASE}.0/TrueNAS-${OS}-22.12.0.iso)"
+    fi
+}
+
 function get_ubuntu() {
     local ISO=""
     local HASH=""

From b97ae012439ea7be7f39b33d9afd90560e0b20cc Mon Sep 17 00:00:00 2001
From: Martin Wimpress <code@flexion.org>
Date: Mon, 23 Jan 2023 10:36:29 +0000
Subject: [PATCH 13/36] Fix syntax error

---
 quickget | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/quickget b/quickget
index 092a339..99cfb11 100755
--- a/quickget
+++ b/quickget
@@ -1468,10 +1468,9 @@ function get_truenas() {
     local URL=""
 
     if [[ "${RELEASE}" == "13.0"* ]] && [ "${OS}" == "CORE" ]; then
-    URL="$(wget https://download.freenas.org/13.0/STABLE/U3.1/x64/${OS}.iso)"
-    
-    elif [[ "${RELEASE}" == "22.12"]] && [ "${OS}" == "SCALE"]; then
-    URL="$(https://download.truenas.com/TrueNAS-SCALE-Bluefin/${RELEASE}.0/TrueNAS-${OS}-22.12.0.iso)"
+        URL="$(wget https://download.freenas.org/13.0/STABLE/U3.1/x64/${OS}.iso)"
+    elif [[ "${RELEASE}" == "22.12"]] && [ "${OS}" == "SCALE" ]; then
+        URL="$(https://download.truenas.com/TrueNAS-SCALE-Bluefin/${RELEASE}.0/TrueNAS-${OS}-22.12.0.iso)"
     fi
 }
 

From b1fc5373326c90e8b6b9e6da5fda71abfde358f5 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <code@flexion.org>
Date: Mon, 23 Jan 2023 10:36:43 +0000
Subject: [PATCH 14/36] White space clean up

---
 quickget | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickget b/quickget
index 99cfb11..d016c86 100755
--- a/quickget
+++ b/quickget
@@ -516,7 +516,7 @@ function releases_ubuntu() {
             daily-live \
              daily-canary \
              ;
-    
+
     else
         echo ${LTS_SUPPORT} \
             ${INTERIM_SUPPORT} \
@@ -813,7 +813,7 @@ EOF
             echo "ram=\"128M\"" >> "${CONF_FILE}"
             ;;
           truenas)
-            echo 
+            echo
             echo "boot=\"legacy\"" >> "${CONF_FILE}"
             echo "bootdrive_size=\"5G\"" >> "${CONF_FILE}" # boot drive
             echo "1stdrive_size=\"20G\"" >> "${CONF_FILE}" # for testing

From ce38ebdada58165c70552bb33e81240d53a86491 Mon Sep 17 00:00:00 2001
From: Ryan Barth <ryan@barth.tech>
Date: Wed, 11 Jan 2023 23:10:05 -0800
Subject: [PATCH 15/36] add endeavouros releases up to 22_12

---
 quickget | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/quickget b/quickget
index d016c86..b33cb46 100755
--- a/quickget
+++ b/quickget
@@ -299,8 +299,13 @@ function releases_elementary() {
 
 function releases_endeavouros() {
     echo apollo_22_1 \
+    artemis-22_6 \
+    artemis_neo_22_7 \
+    artemis_neo_22_8 \
+    artemis_nova_22_9 \
     atlantis-21_4 \
-    atlantis_neo-21_5
+    atlantis_neo-21_5 \
+    cassini_22_12
 }
 
 function releases_fedora() {

From f97ceeabe97c07ab9db0759df74ce962b7f3ea64 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Sat, 21 Jan 2023 13:16:45 +0100
Subject: [PATCH 16/36] Add Mageia

---
 docs/quickemu.1    |  2 ++
 docs/quickemu.1.md |  1 +
 docs/quickget.1    |  2 ++
 docs/quickget.1.md |  1 +
 quickget           | 17 +++++++++++++++++
 5 files changed, 23 insertions(+)

diff --git a/docs/quickemu.1 b/docs/quickemu.1
index 9ee81fa..df61909 100644
--- a/docs/quickemu.1
+++ b/docs/quickemu.1
@@ -385,6 +385,8 @@ All the official Ubuntu flavours are supported, just replace
 .IP \[bu] 2
 \f[V]lmde\f[R] (Linux Mint Debian Edition)
 .IP \[bu] 2
+\f[V]mageia\f[R] (Mageia)
+.IP \[bu] 2
 \f[V]manjaro\f[R] (Manjaro)
 .IP \[bu] 2
 \f[V]mxlinux\f[R] (MX Linux)
diff --git a/docs/quickemu.1.md b/docs/quickemu.1.md
index a26e3d8..5e5f548 100644
--- a/docs/quickemu.1.md
+++ b/docs/quickemu.1.md
@@ -284,6 +284,7 @@ with your preferred flavour.
 -   `kolibrios` (KolibriOS)
 -   `linuxmint` (Linux Mint)
 -   `lmde` (Linux Mint Debian Edition)
+-   `mageia` (Mageia)
 -   `manjaro` (Manjaro)
 -   `mxlinux` (MX Linux)
 -   `netboot` (netboot.xyz)
diff --git a/docs/quickget.1 b/docs/quickget.1
index bf6d0bb..b9171ea 100644
--- a/docs/quickget.1
+++ b/docs/quickget.1
@@ -167,6 +167,8 @@ All the official Ubuntu flavours are supported, just replace
 .IP \[bu] 2
 \f[V]lmde\f[R] (Linux Mint Debian Edition)
 .IP \[bu] 2
+\f[V]mageia\f[R] (Mageia)
+.IP \[bu] 2
 \f[V]manjaro\f[R] (Manjaro)
 .IP \[bu] 2
 \f[V]mxlinux\f[R] (MX Linux)
diff --git a/docs/quickget.1.md b/docs/quickget.1.md
index 50a5e35..140644e 100644
--- a/docs/quickget.1.md
+++ b/docs/quickget.1.md
@@ -116,6 +116,7 @@ with your preferred flavour.
 -   `kolibrios` (KolibriOS)
 -   `linuxmint` (Linux Mint)
 -   `lmde` (Linux Mint Debian Edition)
+-   `mageia` (Mageia)
 -   `manjaro` (Manjaro)
 -   `mxlinux` (MX Linux)
 -   `netboot` (netboot.xyz)
diff --git a/quickget b/quickget
index b33cb46..9f40cbf 100755
--- a/quickget
+++ b/quickget
@@ -49,6 +49,7 @@ function pretty_name() {
     kolibrios)          PRETTY_NAME="KolibriOS";;
     linuxmint)          PRETTY_NAME="Linux Mint";;
     lmde)               PRETTY_NAME="Linux Mint Debian Edition";;
+    mageia)             PRETTY_NAME="Mageia";;
     mxlinux)            PRETTY_NAME="MX Linux";;
     netboot)            PRETTY_NAME="netboot.xyz";;
     netbsd)             PRETTY_NAME="NetBSD";;
@@ -189,6 +190,7 @@ function os_support() {
     kubuntu \
     linuxmint \
     lmde \
+    mageia \
     manjaro \
     mxlinux \
     netboot \
@@ -398,6 +400,14 @@ function releases_lmde(){
     echo 5
 }
 
+function releases_mageia(){
+    echo 8
+}
+
+function editions_mageia(){
+    echo Plasma GNOME Xfce
+}
+
 function releases_mxlinux(){
     echo 21.2.1
 }
@@ -1303,6 +1313,13 @@ function get_macos() {
     make_vm_config RecoveryImage.img
 }
 
+function get_mageia() {
+    local EDITION="${1:-}"
+    local ISO=$(wget -q https://www.mageia.org/en/downloads/get/?q="Mageia-${RELEASE}-Live-${EDITION}-x86_64.iso" -O- | grep 'click here'| grep -o 'href=.*\.iso'|cut -d\" -f2)
+    local HASH=$(wget -q -O- "${ISO}.sha512" | cut -d' ' -f1)
+    echo "${ISO} ${HASH}"
+}
+
 function get_manjaro() {
     local HASH=""
     local ISO=""

From 66703ddd6c5431fe1772ed98bbe392a9bdeafdfe Mon Sep 17 00:00:00 2001
From: Martin Wimpress <code@flexion.org>
Date: Mon, 23 Jan 2023 10:47:14 +0000
Subject: [PATCH 17/36] Fix more syntax errors in TrueNAS function

---
 quickget | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickget b/quickget
index d016c86..d1888f3 100755
--- a/quickget
+++ b/quickget
@@ -1467,9 +1467,9 @@ function get_truenas() {
     local ISO=""
     local URL=""
 
-    if [[ "${RELEASE}" == "13.0"* ]] && [ "${OS}" == "CORE" ]; then
+    if [ "${RELEASE}" == "13.0" ] && [ "${OS}" == "CORE" ]; then
         URL="$(wget https://download.freenas.org/13.0/STABLE/U3.1/x64/${OS}.iso)"
-    elif [[ "${RELEASE}" == "22.12"]] && [ "${OS}" == "SCALE" ]; then
+    elif [ "${RELEASE}" == "22.12" ] && [ "${OS}" == "SCALE" ]; then
         URL="$(https://download.truenas.com/TrueNAS-SCALE-Bluefin/${RELEASE}.0/TrueNAS-${OS}-22.12.0.iso)"
     fi
 }

From 809ad68fd868cf7e8d203cc91474c9d076f96282 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <code@flexion.org>
Date: Mon, 23 Jan 2023 11:00:28 +0000
Subject: [PATCH 18/36] Acknowledgement that Windows downloads are not working
 automatically #6123

We'll investigate more robust solution to this issue.
---
 quickget | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickget b/quickget
index e125661..d3c507e 100755
--- a/quickget
+++ b/quickget
@@ -1924,7 +1924,8 @@ function get_windows() {
 
     MS_BASE_URL="https://software.download.prss.microsoft.com/"
     if [[ ! ${DOWNLOAD_URL} =~ ^${MS_BASE_URL} ]]; then
-        echo "Download URL not leading to Microsoft CDN"
+        echo "Download URL (${DOWNLOAD_URL}) not leading to Microsoft CDN"
+        echo "Please download a Windows .ISO manaully and configure quickemu accordingly"
         exit 1
     fi
 

From 75c80d89fd7c0146747a3ea9c7a766b9a3204a36 Mon Sep 17 00:00:00 2001
From: Alan Pope <alan@popey.com>
Date: Tue, 31 Jan 2023 17:21:36 +0000
Subject: [PATCH 19/36] Add elementary 7.0

Hopefully I did this right. I tested locally, and it appears to download the 7.0 ISO correctly.
---
 quickget | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/quickget b/quickget
index d3c507e..ffe0c1b 100755
--- a/quickget
+++ b/quickget
@@ -296,7 +296,7 @@ function releases_dragonflybsd() {
 }
 
 function releases_elementary() {
-    echo 6.1
+    echo 6.1 7.0
 }
 
 function releases_endeavouros() {
@@ -1067,7 +1067,14 @@ function get_dragonflybsd() {
 
 function get_elementary() {
     local HASH=""
-    local ISO="elementaryos-${RELEASE}-stable.20211218-rc.iso"
+    case ${RELEASE} in
+      6.2)
+        local ISO="elementaryos-${RELEASE}-stable.20211218-rc.iso"
+        ;;
+      7.0)
+        local ISO="elementaryos-${RELEASE}-stable.20230129rc.iso"
+        ;;
+    esac
     local URL="https://ams3.dl.elementary.io/download"
     echo "${URL}/$(date +%s | base64)/${ISO} ${HASH}"
 }

From b46aca69c95a074f37d7ae9aea36c46623fc4cb9 Mon Sep 17 00:00:00 2001
From: hi-phile <510finn@gmail.com>
Date: Wed, 25 Jan 2023 18:47:15 -0800
Subject: [PATCH 20/36] Added support for RebornOS in quickget

Added support for RebornOS, tested and working.
---
 quickget | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/quickget b/quickget
index ffe0c1b..38a1d30 100755
--- a/quickget
+++ b/quickget
@@ -60,6 +60,7 @@ function pretty_name() {
     oraclelinux)        PRETTY_NAME="Oracle Linux";;
     popos)              PRETTY_NAME="Pop!_OS";;
     reactos)            PRETTY_NAME="ReactOS";;
+    rebornos)           PRETTY_NAME="RebornOS";;
     rockylinux)         PRETTY_NAME="Rocky Linux";;
     ubuntu-budgie)      PRETTY_NAME="Ubuntu Budgie";;
     ubuntukylin)       PRETTY_NAME="Ubuntu Kylin";;
@@ -203,6 +204,7 @@ function os_support() {
     oraclelinux \
     popos \
     reactos \
+    rebornos \
     rockylinux \
     slackware \
     solus \
@@ -471,6 +473,16 @@ function releases_reactos() {
     echo latest
 }
 
+function releases_rebornos() {
+    echo latest
+}
+
+function get_rebornos() {
+   local ISO=$(curl -s 'https://www.rebornos.org/download/' | grep -ohE 'https://pub-cb7a4d4f7a974896b3bf40c52d1defbc.r2.dev/RebornOS-ISO/(rebornos_xfce_minimal|rebornos_iso)-[0-9]{4}.[0-9]{2}.[0-9]{2}-x86_64.iso' | tail -n1)
+   local HASH=$(curl -s 'https://www.rebornos.org/download/' | grep -ozP 'Checksum MD5:.*[0-9a-fA-F]{32}' | grep -zoP '[0-9a-fA-F]{32}' | cut -d '' -f1)
+   echo "${ISO} ${HASH}"
+}
+
 function releases_rockylinux() {
     echo 8.3 8.4 8.5 9.0
 }

From ce04397793c7be5e80b07e999a369e5a457073f3 Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Mon, 23 Jan 2023 18:28:22 +0000
Subject: [PATCH 21/36] Correct basic error to get to downloading isos

---
 quickget | 50 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/quickget b/quickget
index 38a1d30..d079702 100755
--- a/quickget
+++ b/quickget
@@ -62,6 +62,8 @@ function pretty_name() {
     reactos)            PRETTY_NAME="ReactOS";;
     rebornos)           PRETTY_NAME="RebornOS";;
     rockylinux)         PRETTY_NAME="Rocky Linux";;
+    truenas-core)       PRETTY_NAME="TrueNAS Core";;
+    truenas-scale)      PRETTY_NAME="TrueNAS Scale";;
     ubuntu-budgie)      PRETTY_NAME="Ubuntu Budgie";;
     ubuntukylin)       PRETTY_NAME="Ubuntu Kylin";;
     ubuntu-mate)        PRETTY_NAME="Ubuntu MATE";;
@@ -69,7 +71,6 @@ function pretty_name() {
     ubuntu-unity)       PRETTY_NAME="Ubuntu Unity";;
     void)               PRETTY_NAME="Void Linux";;
     zorin)              PRETTY_NAME="Zorin OS";;
-    truenas)            PRETTY_NAME="TrueNAS";;
     *)                  PRETTY_NAME="${SIMPLE_NAME^}";;
   esac
   echo "${PRETTY_NAME}"
@@ -209,7 +210,8 @@ function os_support() {
     slackware \
     solus \
     tails \
-    truenas \
+    truenas-core \
+    truenas-scale \
     ubuntu \
     ubuntu-budgie \
     ubuntukylin \
@@ -509,12 +511,19 @@ function releases_tails() {
     echo stable
 }
 
-function editions_truenas() {
-    echo core scale # enterprise is proprietary and paid
+function releases_truenas() {
+  if [[ $OS == truenas ]] ; then
+    echo "ERROR! The supported TrueNAS OS values are truenas-core or truenas-scale"
+    exit 1;
+  fi
+  }
+
+function releases_truenas-core() {
+   echo 12.0 13.0
 }
 
-function releases_truenas() {
-    echo 22.12 13.0
+function releases_truenas-scale() {
+    echo 22.02 22.12
 }
 
 function releases_ubuntu() {
@@ -786,7 +795,7 @@ function make_vm_config() {
         reactos)
             GUEST="reactos"
             IMAGE_TYPE="iso";;
-        truenas)
+        truenas*)
             GUEST="truenas"
             IMAGE_TYPE="iso";;
         windows)
@@ -839,7 +848,7 @@ EOF
             echo "disk_size=\"2G\"" >> "${CONF_FILE}"
             echo "ram=\"128M\"" >> "${CONF_FILE}"
             ;;
-          truenas)
+          truenas-scale|truenas-core)
             echo
             echo "boot=\"legacy\"" >> "${CONF_FILE}"
             echo "bootdrive_size=\"5G\"" >> "${CONF_FILE}" # boot drive
@@ -1504,15 +1513,27 @@ function get_tails() {
     echo "${URL} ${HASH}"
 }
 
-function get_truenas() {
+function get_truenas-scale() {
     local ISO=""
     local URL=""
 
-    if [ "${RELEASE}" == "13.0" ] && [ "${OS}" == "CORE" ]; then
-        URL="$(wget https://download.freenas.org/13.0/STABLE/U3.1/x64/${OS}.iso)"
-    elif [ "${RELEASE}" == "22.12" ] && [ "${OS}" == "SCALE" ]; then
-        URL="$(https://download.truenas.com/TrueNAS-SCALE-Bluefin/${RELEASE}.0/TrueNAS-${OS}-22.12.0.iso)"
-    fi
+    local DLINFO="https://www.truenas.com/download-truenas-scale/"
+
+    URL=$(wget -q ${DLINFO} -O- | grep -o "\"https://.*${RELEASE}.*\.iso\""|cut -d\" -f2)
+    HASH=$(wget -q ${URL}.sha256 -O- | cut -d' ' -f1 )
+
+    echo "${URL} ${HASH}"
+}
+
+function get_truenas-core() {
+    local ISO=""
+    local URL=""
+
+    local DLINFO="https://www.truenas.com/download-truenas-core/"
+    URL=$(wget -q ${DLINFO} -O- | grep -o "\"https://.*${RELEASE}.*\.iso\""|cut -d\" -f2)
+    HASH=$(wget -q ${URL}.sha256 -O- | cut -d' ' -f1)
+
+    echo "${URL} ${HASH}"
 }
 
 function get_ubuntu() {
@@ -2068,6 +2089,7 @@ if [ -n "${2}" ]; then
             fi
         fi
 
+
         VM_PATH="${OS}-${RELEASE}-${EDITION}"
         validate_release "releases_${OS}"
         create_vm "$("get_${OS}" "${EDITION}")"

From e7480e182062fab8102e9ea9ee61af18f68ebd12 Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Mon, 23 Jan 2023 18:47:19 +0000
Subject: [PATCH 22/36] comment out non-supported lines aimed at the conf

---
 quickget | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/quickget b/quickget
index d079702..dc4adc2 100755
--- a/quickget
+++ b/quickget
@@ -851,9 +851,10 @@ EOF
           truenas-scale|truenas-core)
             echo
             echo "boot=\"legacy\"" >> "${CONF_FILE}"
-            echo "bootdrive_size=\"5G\"" >> "${CONF_FILE}" # boot drive
-            echo "1stdrive_size=\"20G\"" >> "${CONF_FILE}" # for testing
-            echo "2nddrive_size=\"20G\"" >> "${CONF_FILE}" # again, for testing
+           # the rest is non-functional
+           # echo "bootdrive_size=\"5G\"" >> "${CONF_FILE}" # boot drive
+           # echo "1stdrive_size=\"20G\"" >> "${CONF_FILE}" # for testing
+           # echo "2nddrive_size=\"20G\"" >> "${CONF_FILE}" # again, for testing
             ;;
           zorin)
             case  ${EDITION} in

From 9f1c3af1226498c46ff6ef61c2475254a8754512 Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Thu, 2 Feb 2023 21:37:34 +0000
Subject: [PATCH 23/36] chore: regenerated docs for release

---
 README.md               | 9 ++++++---
 docs/quickemu.1         | 8 +++++++-
 docs/quickemu.1.md      | 5 ++++-
 docs/quickemu_conf.1    | 2 +-
 docs/quickemu_conf.1.md | 2 +-
 docs/quickget.1         | 8 +++++++-
 docs/quickget.1.md      | 5 ++++-
 7 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index c282643..907d6b1 100644
--- a/README.md
+++ b/README.md
@@ -225,8 +225,8 @@ with your preferred flavour.
 -   `ubuntukylin` (Ubuntu Kylin)
 -   `ubuntu-mate` (Ubuntu MATE)
 -   `ubuntustudio` (Ubuntu Studio)
--   `ubuntu-unity` (Ubuntu Unity)
 -   `ubuntu` (Ubuntu)
+-   `ubuntu-unity` (Ubuntu Unity)
 -   `xubuntu` (Xubuntu)
 
 ## Other Operating Systems
@@ -260,6 +260,7 @@ with your preferred flavour.
 -   `kolibrios` (KolibriOS)
 -   `linuxmint` (Linux Mint)
 -   `lmde` (Linux Mint Debian Edition)
+-   `mageia` (Mageia)
 -   `manjaro` (Manjaro)
 -   `mxlinux` (MX Linux)
 -   `netboot` (netboot.xyz)
@@ -270,10 +271,13 @@ with your preferred flavour.
 -   `oraclelinux` (Oracle Linux)
 -   `popos` (Pop!\_OS)
 -   `reactos` (ReactOS)
+-   `rebornos` (RebornOS)
 -   `rockylinux` (Rocky Linux)
 -   `slackware` (Slackware)
 -   `solus` (Solus)
 -   `tails` (Tails)
+-   `truenas-core` (TrueNAS Core)
+-   `truenas-scale` (TrueNAS Scale)
 -   `void` (Void Linux)
 -   `zorin` (Zorin OS)
 
@@ -776,9 +780,8 @@ You can also pass optional parameters
   --extra_args <arguments>          : Pass additional arguments to qemu
   --version                         : Print version
 
-```
 <!-- [[[end]]] -->
-
+```
 ## Desktop shortcuts
 
 Desktop shortcuts can be created for a VM, the shortcuts are saved in
diff --git a/docs/quickemu.1 b/docs/quickemu.1
index df61909..70da5ad 100644
--- a/docs/quickemu.1
+++ b/docs/quickemu.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKEMU" "1" "December 11, 2022" "quickemu" "Quickemu User Manual"
+.TH "QUICKEMU" "1" "February 2, 2023" "quickemu" "Quickemu User Manual"
 .hy
 .SH NAME
 .PP
@@ -407,6 +407,8 @@ All the official Ubuntu flavours are supported, just replace
 .IP \[bu] 2
 \f[V]reactos\f[R] (ReactOS)
 .IP \[bu] 2
+\f[V]rebornos\f[R] (RebornOS)
+.IP \[bu] 2
 \f[V]rockylinux\f[R] (Rocky Linux)
 .IP \[bu] 2
 \f[V]slackware\f[R] (Slackware)
@@ -415,6 +417,10 @@ All the official Ubuntu flavours are supported, just replace
 .IP \[bu] 2
 \f[V]tails\f[R] (Tails)
 .IP \[bu] 2
+\f[V]truenas-core\f[R] (TrueNAS Core)
+.IP \[bu] 2
+\f[V]truenas-scale\f[R] (TrueNAS Scale)
+.IP \[bu] 2
 \f[V]void\f[R] (Void Linux)
 .IP \[bu] 2
 \f[V]zorin\f[R] (Zorin OS)
diff --git a/docs/quickemu.1.md b/docs/quickemu.1.md
index 5e5f548..31d8804 100644
--- a/docs/quickemu.1.md
+++ b/docs/quickemu.1.md
@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: December 11, 2022
+date: February 2, 2023
 footer: quickemu
 header: Quickemu User Manual
 section: 1
@@ -295,10 +295,13 @@ with your preferred flavour.
 -   `oraclelinux` (Oracle Linux)
 -   `popos` (Pop!\_OS)
 -   `reactos` (ReactOS)
+-   `rebornos` (RebornOS)
 -   `rockylinux` (Rocky Linux)
 -   `slackware` (Slackware)
 -   `solus` (Solus)
 -   `tails` (Tails)
+-   `truenas-core` (TrueNAS Core)
+-   `truenas-scale` (TrueNAS Scale)
 -   `void` (Void Linux)
 -   `zorin` (Zorin OS)
 
diff --git a/docs/quickemu_conf.1 b/docs/quickemu_conf.1
index ee910b1..8756639 100644
--- a/docs/quickemu_conf.1
+++ b/docs/quickemu_conf.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKEMU_CONF" "1" "December 11, 2022" "quickemu_conf" "Quickemu Configuration Manual"
+.TH "QUICKEMU_CONF" "1" "February 2, 2023" "quickemu_conf" "Quickemu Configuration Manual"
 .hy
 .SH NAME
 .PP
diff --git a/docs/quickemu_conf.1.md b/docs/quickemu_conf.1.md
index 2305dd5..08977f4 100644
--- a/docs/quickemu_conf.1.md
+++ b/docs/quickemu_conf.1.md
@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: December 11, 2022
+date: February 2, 2023
 footer: quickemu_conf
 header: Quickemu Configuration Manual
 section: 1
diff --git a/docs/quickget.1 b/docs/quickget.1
index b9171ea..460ffc0 100644
--- a/docs/quickget.1
+++ b/docs/quickget.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKGET" "1" "December 11, 2022" "quickget" "Quickget User Manual"
+.TH "QUICKGET" "1" "February 2, 2023" "quickget" "Quickget User Manual"
 .hy
 .SH NAME
 .PP
@@ -189,6 +189,8 @@ All the official Ubuntu flavours are supported, just replace
 .IP \[bu] 2
 \f[V]reactos\f[R] (ReactOS)
 .IP \[bu] 2
+\f[V]rebornos\f[R] (RebornOS)
+.IP \[bu] 2
 \f[V]rockylinux\f[R] (Rocky Linux)
 .IP \[bu] 2
 \f[V]slackware\f[R] (Slackware)
@@ -197,6 +199,10 @@ All the official Ubuntu flavours are supported, just replace
 .IP \[bu] 2
 \f[V]tails\f[R] (Tails)
 .IP \[bu] 2
+\f[V]truenas-core\f[R] (TrueNAS Core)
+.IP \[bu] 2
+\f[V]truenas-scale\f[R] (TrueNAS Scale)
+.IP \[bu] 2
 \f[V]void\f[R] (Void Linux)
 .IP \[bu] 2
 \f[V]zorin\f[R] (Zorin OS)
diff --git a/docs/quickget.1.md b/docs/quickget.1.md
index 140644e..64d0274 100644
--- a/docs/quickget.1.md
+++ b/docs/quickget.1.md
@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: December 11, 2022
+date: February 2, 2023
 footer: quickget
 header: Quickget User Manual
 section: 1
@@ -127,10 +127,13 @@ with your preferred flavour.
 -   `oraclelinux` (Oracle Linux)
 -   `popos` (Pop!\_OS)
 -   `reactos` (ReactOS)
+-   `rebornos` (RebornOS)
 -   `rockylinux` (Rocky Linux)
 -   `slackware` (Slackware)
 -   `solus` (Solus)
 -   `tails` (Tails)
+-   `truenas-core` (TrueNAS Core)
+-   `truenas-scale` (TrueNAS Scale)
 -   `void` (Void Linux)
 -   `zorin` (Zorin OS)
 

From 206c93d8e58bf623bece239cdb4ef5549429bba3 Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Fri, 3 Feb 2023 18:04:57 +0000
Subject: [PATCH 24/36] Aligned config file options with current list

---
 README.md               |  1 +
 build-docs              |  2 +-
 docs/quickemu.1         |  2 +-
 docs/quickemu.1.md      |  2 +-
 docs/quickemu_conf.1    | 22 +++++++++++++++++++++-
 docs/quickemu_conf.1.md | 22 +++++++++++++++++++++-
 docs/quickget.1         |  2 +-
 docs/quickget.1.md      |  2 +-
 8 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 907d6b1..9e401eb 100644
--- a/README.md
+++ b/README.md
@@ -782,6 +782,7 @@ You can also pass optional parameters
 
 <!-- [[[end]]] -->
 ```
+
 ## Desktop shortcuts
 
 Desktop shortcuts can be created for a VM, the shortcuts are saved in
diff --git a/build-docs b/build-docs
index 297a1d4..43c38df 160000
--- a/build-docs
+++ b/build-docs
@@ -1 +1 @@
-Subproject commit 297a1d4403ca0ddda062fdd086f4a00c8357452e
+Subproject commit 43c38df5ef08bada423b076274604951d5c13c0d
diff --git a/docs/quickemu.1 b/docs/quickemu.1
index 70da5ad..7d92369 100644
--- a/docs/quickemu.1
+++ b/docs/quickemu.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKEMU" "1" "February 2, 2023" "quickemu" "Quickemu User Manual"
+.TH "QUICKEMU" "1" "February 3, 2023" "quickemu" "Quickemu User Manual"
 .hy
 .SH NAME
 .PP
diff --git a/docs/quickemu.1.md b/docs/quickemu.1.md
index 31d8804..698bfd0 100644
--- a/docs/quickemu.1.md
+++ b/docs/quickemu.1.md
@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: February 2, 2023
+date: February 3, 2023
 footer: quickemu
 header: Quickemu User Manual
 section: 1
diff --git a/docs/quickemu_conf.1 b/docs/quickemu_conf.1
index 8756639..fa462dd 100644
--- a/docs/quickemu_conf.1
+++ b/docs/quickemu_conf.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKEMU_CONF" "1" "February 2, 2023" "quickemu_conf" "Quickemu Configuration Manual"
+.TH "QUICKEMU_CONF" "1" "February 3, 2023" "quickemu_conf" "Quickemu Configuration Manual"
 .hy
 .SH NAME
 .PP
@@ -38,6 +38,8 @@ boot=\[dq]efi\[dq]
 cpu_cores=\[dq]\[dq]
 disk_img=\[dq]\[dq]
 disk_size=\[dq]\[dq]
+display=\[dq]\[dq]
+extra_args=\[dq]\[dq]
 fixed_iso=\[dq]\[dq]
 floppy=\[dq]\[dq]
 guest_os=\[dq]linux\[dq]
@@ -52,6 +54,24 @@ ram=\[dq]\[dq]
 secureboot=\[dq]off\[dq]
 tpm=\[dq]off\[dq]
 usb_devices=()
+viewer=\[dq]spicy\[dq]
+ssh_port=\[dq]\[dq]
+spice_port=\[dq]\[dq]
+public_dir=\[dq]\[dq]
+monitor=\[dq]socket\[dq]
+monitor_telnet_port=\[dq]4440\[dq]
+monitor_telnet_host=\[dq]localhost\[dq]
+monitor_cmd=\[dq]\[dq]
+serial=\[dq]socket\[dq]
+serial_telnet_port=\[dq]6660\[dq]
+serial_telnet_host=\[dq]localhost\[dq]
+# options: ehci(USB2.0), xhci(USB3.0)
+usb_controller=\[dq]ehci\[dq]
+# options: ps2, usb, virtio
+keyboard=\[dq]usb\[dq]
+keyboard_layout=\[dq]en-us\[dq]
+# options: ps2, usb, tablet, virtio
+mouse=\[dq]tablet\[dq]
 \f[R]
 .fi
 .SH EXAMPLES
diff --git a/docs/quickemu_conf.1.md b/docs/quickemu_conf.1.md
index 08977f4..abc6cd1 100644
--- a/docs/quickemu_conf.1.md
+++ b/docs/quickemu_conf.1.md
@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: February 2, 2023
+date: February 3, 2023
 footer: quickemu_conf
 header: Quickemu Configuration Manual
 section: 1
@@ -29,6 +29,8 @@ boot="efi"
 cpu_cores=""
 disk_img=""
 disk_size=""
+display=""
+extra_args=""
 fixed_iso=""
 floppy=""
 guest_os="linux"
@@ -43,6 +45,24 @@ ram=""
 secureboot="off"
 tpm="off"
 usb_devices=()
+viewer="spicy"
+ssh_port=""
+spice_port=""
+public_dir=""
+monitor="socket"
+monitor_telnet_port="4440"
+monitor_telnet_host="localhost"
+monitor_cmd=""
+serial="socket"
+serial_telnet_port="6660"
+serial_telnet_host="localhost"
+# options: ehci(USB2.0), xhci(USB3.0)
+usb_controller="ehci"
+# options: ps2, usb, virtio
+keyboard="usb"
+keyboard_layout="en-us"
+# options: ps2, usb, tablet, virtio
+mouse="tablet"
 ```
 
 # EXAMPLES
diff --git a/docs/quickget.1 b/docs/quickget.1
index 460ffc0..e79fe6c 100644
--- a/docs/quickget.1
+++ b/docs/quickget.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKGET" "1" "February 2, 2023" "quickget" "Quickget User Manual"
+.TH "QUICKGET" "1" "February 3, 2023" "quickget" "Quickget User Manual"
 .hy
 .SH NAME
 .PP
diff --git a/docs/quickget.1.md b/docs/quickget.1.md
index 64d0274..24abbca 100644
--- a/docs/quickget.1.md
+++ b/docs/quickget.1.md
@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: February 2, 2023
+date: February 3, 2023
 footer: quickget
 header: Quickget User Manual
 section: 1

From 40221ffe71b6b184cf191aca2e59ea430ec073d9 Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Fri, 3 Feb 2023 14:11:57 +0000
Subject: [PATCH 25/36] Alma 9.1 is released

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

diff --git a/quickget b/quickget
index dc4adc2..15c5970 100755
--- a/quickget
+++ b/quickget
@@ -225,7 +225,7 @@ function os_support() {
 }
 
 function releases_alma() {
-    echo 8.6 8.7 9.0 9.1-beta-1
+    echo 8.6 8.7 9.0 9.1
 }
 
 function editions_alma() {

From 9ab21571d0ec87c4f0637ef7c1158005a98db22b Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Fri, 3 Feb 2023 14:26:08 +0000
Subject: [PATCH 26/36] updated cachyos release

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

diff --git a/quickget b/quickget
index 15c5970..8dec81d 100755
--- a/quickget
+++ b/quickget
@@ -261,7 +261,7 @@ function editions_arcolinux() {
 }
 
 function releases_cachyos() {
-    echo 220919 221023
+    echo 230121
 }
 
 function editions_cachyos() {

From d4d95588926f9e6650bd14fa6a1953bb6fda667c Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Fri, 3 Feb 2023 14:41:49 +0000
Subject: [PATCH 27/36] Remove old release from elementary - they only present
 current release

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

diff --git a/quickget b/quickget
index 8dec81d..9d9f087 100755
--- a/quickget
+++ b/quickget
@@ -300,7 +300,7 @@ function releases_dragonflybsd() {
 }
 
 function releases_elementary() {
-    echo 6.1 7.0
+    echo 7.0
 }
 
 function releases_endeavouros() {

From eaa5f1cad295d0561fe90afbf4cd9cbaf29c64d6 Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Fri, 3 Feb 2023 16:04:28 +0000
Subject: [PATCH 28/36] Update drgaonfly release to current

Older isos are bzipped so until we handle that only current is available
---
 quickget | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickget b/quickget
index 9d9f087..019ca09 100755
--- a/quickget
+++ b/quickget
@@ -296,7 +296,7 @@ function releases_devuan() {
 }
 
 function releases_dragonflybsd() {
-    echo 6.2.1
+    echo 6.4.0
 }
 
 function releases_elementary() {

From 9a3e5b3e01b7a41649fbd75bb280793670cd4465 Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Fri, 3 Feb 2023 16:58:11 +0000
Subject: [PATCH 29/36] Update mxlinux to current release

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

diff --git a/quickget b/quickget
index 019ca09..ea237e2 100755
--- a/quickget
+++ b/quickget
@@ -413,7 +413,7 @@ function editions_mageia(){
 }
 
 function releases_mxlinux(){
-    echo 21.2.1
+    echo 21.3
 }
 
 function editions_mxlinux(){

From 5da140262a7216655783c148babd83013a889198 Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Fri, 3 Feb 2023 17:09:25 +0000
Subject: [PATCH 30/36] Updated for release of Rocky Linux 9.1

---
 quickget | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quickget b/quickget
index ea237e2..bbbbe84 100755
--- a/quickget
+++ b/quickget
@@ -486,7 +486,7 @@ function get_rebornos() {
 }
 
 function releases_rockylinux() {
-    echo 8.3 8.4 8.5 9.0
+    echo 8.3 8.4 8.5 9.0 9.1
 }
 
 # Rocky have renamed dvd1 -> dvd at 9.0
@@ -1477,7 +1477,7 @@ function get_rockylinux() {
     local URL=""
 
     case ${RELEASE} in
-      9.0) URL="https://download.rockylinux.org/pub/rocky/${RELEASE}/isos/x86_64";;
+      9.1) URL="https://download.rockylinux.org/pub/rocky/${RELEASE}/isos/x86_64";;
       *)   URL="http://dl.rockylinux.org/vault/rocky/${RELEASE}/isos/x86_64/";;
     esac
     HASH=$(wget -q -O- "${URL}/CHECKSUM" | grep "SHA256" | grep "${ISO})" | cut -d' ' -f4)

From f407fc9e2fde43cdba3bddca1350c6fe0a1e1e43 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <code@flexion.org>
Date: Fri, 3 Feb 2023 23:09:34 +0000
Subject: [PATCH 31/36] Merge WIP build-docs

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

diff --git a/build-docs b/build-docs
index 43c38df..297a1d4 160000
--- a/build-docs
+++ b/build-docs
@@ -1 +1 @@
-Subproject commit 43c38df5ef08bada423b076274604951d5c13c0d
+Subproject commit 297a1d4403ca0ddda062fdd086f4a00c8357452e

From 428640563927d5418ec5438171116d3bcd3919ae Mon Sep 17 00:00:00 2001
From: Martin Wimpress <code@flexion.org>
Date: Mon, 23 Jan 2023 11:00:28 +0000
Subject: [PATCH 32/36] Revert "Acknowledgement that Windows downloads are not
 working automatically #6123"

This reverts commit 809ad68fd868cf7e8d203cc91474c9d076f96282.
---
 quickget | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/quickget b/quickget
index bbbbe84..e94b65a 100755
--- a/quickget
+++ b/quickget
@@ -1965,8 +1965,7 @@ function get_windows() {
 
     MS_BASE_URL="https://software.download.prss.microsoft.com/"
     if [[ ! ${DOWNLOAD_URL} =~ ^${MS_BASE_URL} ]]; then
-        echo "Download URL (${DOWNLOAD_URL}) not leading to Microsoft CDN"
-        echo "Please download a Windows .ISO manaully and configure quickemu accordingly"
+        echo "Download URL not leading to Microsoft CDN"
         exit 1
     fi
 

From 8d3cf4c1a7c6f0b7297fa4dbe250b6ab6cd4fd38 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <code@flexion.org>
Date: Sat, 4 Feb 2023 00:06:37 +0000
Subject: [PATCH 33/36] Prompt the user to download the Windows iso manually.
 Closes #612

---
 quickget | 126 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 75 insertions(+), 51 deletions(-)

diff --git a/quickget b/quickget
index e94b65a..b03b5ab 100755
--- a/quickget
+++ b/quickget
@@ -1907,12 +1907,19 @@ function dbg_windows() {
 
 # Adapted from https://gist.github.com/hongkongkiwi/15a5bf16437315df256c118c163607cb
 function get_windows() {
+    # Use the API to automatically download a Windows .iso image
+    # The API we were using is unmaintained and not currently functional
+    #  0 : Prompt for a manual ISO download
+    #  1 : Use the API for automated download
+    local API_GUIDED_DOWNLOAD=0
+
     local ARCH="x64"
     local INDEX=0
     local LANG_CODE="en"
     local LANG_EDITION="${1}"
     local LATEST_WINDOWS_VERSION=""
     local WINDOWS_NAME=""
+    local WINDOWS_ISO_URL=""
     local VERSION_ID=""
     local EDITION_ID=""
     local LANGUAGE_ID=""
@@ -1922,59 +1929,72 @@ function get_windows() {
     local DOWNLOAD_ID=""
     local DOWNLOAD_URL=""
 
-    # Ignore the most recent Windows 10 release for now.
-    case ${RELEASE} in
-      10) INDEX=0;;
-      11) INDEX=0;;
-    esac
-
-    echo "Getting Windows ${RELEASE} URL..."
-    WINDOWS_VERSIONS=$(wget -4 -q -O- "https://tb.rg-adguard.net/php/get_version.php?type_id=1" | jq '.versions | sort_by(-(.version_id | tonumber))')
-    dbg_windows "${WINDOWS_VERSIONS}"
-    LATEST_WINDOWS_VERSION=$(echo "${WINDOWS_VERSIONS}" | jq -c 'map(select(.name | contains("Windows '"${RELEASE}"'")))['${INDEX}']')
-    dbg_windows "${LATEST_WINDOWS_VERSION}"
-    WINDOWS_NAME=$(echo "${LATEST_WINDOWS_VERSION}" | jq -r .name)
-    dbg_windows "${WINDOWS_NAME}"
-    VERSION_ID=$(echo "${LATEST_WINDOWS_VERSION}" | jq -r .version_id)
-    dbg_windows "${VERSION_ID}"
+    if [ ${API_GUIDED_DOWNLOAD} -eq 1 ]; then
+        # Ignore the most recent Windows 10 release for now.
+        case ${RELEASE} in
+        10) INDEX=0;;
+        11) INDEX=0;;
+        esac
 
-    case ${RELEASE} in
-        8) EDITION_ID=$(wget -4 -q -O- "https://tb.rg-adguard.net/php/get_edition.php?version_id=${VERSION_ID}&lang=name_${LANG_CODE}" | jq -r '.editions[] | select(.name_'${LANG_CODE}'=="Windows 8.1 Pro + Core").edition_id');;
-        10|11) EDITION_ID=$(wget -4 -q -O- "https://tb.rg-adguard.net/php/get_edition.php?version_id=${VERSION_ID}&lang=name_${LANG_CODE}" | jq -r '.editions[] | select(.name_'${LANG_CODE}'=="Windows '"${RELEASE}"'").edition_id');;
-    esac
-    dbg_windows "${EDITION_ID}"
-
-    LANGUAGE_ID=$(wget -4 -q -O- "https://tb.rg-adguard.net/php/get_language.php?edition_id=${EDITION_ID}&lang=name_${LANG_CODE}" | jq -r '.languages[] | select(.name_'${LANG_CODE}'=="'"${LANG_EDITION}"'").language_id')
-    dbg_windows "${LANGUAGE_ID}"
-    ARCH_INFO=$(wget -4 -q -O- "https://tb.rg-adguard.net/php/get_arch.php?language_id=${LANGUAGE_ID}")
-    dbg_windows "${ARCH_INFO}"
-    FILE_NAME=$(echo "${ARCH_INFO}" | jq -r '.archs[] | select(.name | contains("'${ARCH}'")).name')
-    dbg_windows "${FILE_NAME}"
-    ARCH_ID=$(echo "${ARCH_INFO}" | jq -r '.archs[] | select(.name | contains("'${ARCH}'")).arch_id')
-    dbg_windows "${ARCH_ID}"
-    DOWNLOAD_INFO=$(wget -4 -q -O- "https://tb.rg-adguard.net/dl.php?fileName=${ARCH_ID}&lang=en")
-    dbg_windows "${DOWNLOAD_INFO}"
-    DOWNLOAD_SHA1=$(echo "${DOWNLOAD_INFO}" | sed -e 's/<[^>]*>//g' | grep -o -P '(?<=SHA1: ).*(?= expire)' | sed 's/Link//')
-    dbg_windows "${DOWNLOAD_SHA1}"
-    DOWNLOAD_ID=$(echo "${DOWNLOAD_INFO}" | grep -oP '(?<=https:\/\/tb\.rg-adguard\.net/dl\.php\?go=)[0-9a-z]+')
-    dbg_windows "${DOWNLOAD_ID}"
-    REDIRECT_URL="https://tb.rg-adguard.net/dl.php?go=${DOWNLOAD_ID}"
-    dbg_windows "${REDIRECT_URL}"
-    DOWNLOAD_URL=$(curl --head --silent --write-out "%{redirect_url}\n" --output /dev/null "${REDIRECT_URL}")
-    dbg_windows "${DOWNLOAD_URL}"
-
-    MS_BASE_URL="https://software.download.prss.microsoft.com/"
-    if [[ ! ${DOWNLOAD_URL} =~ ^${MS_BASE_URL} ]]; then
-        echo "Download URL not leading to Microsoft CDN"
-        exit 1
-    fi
+        echo "Getting Windows ${RELEASE} URL..."
+        WINDOWS_VERSIONS=$(wget -4 -q -O- "https://tb.rg-adguard.net/php/get_version.php?type_id=1" | jq '.versions | sort_by(-(.version_id | tonumber))')
+        dbg_windows "${WINDOWS_VERSIONS}"
+        LATEST_WINDOWS_VERSION=$(echo "${WINDOWS_VERSIONS}" | jq -c 'map(select(.name | contains("Windows '"${RELEASE}"'")))['${INDEX}']')
+        dbg_windows "${LATEST_WINDOWS_VERSION}"
+        WINDOWS_NAME=$(echo "${LATEST_WINDOWS_VERSION}" | jq -r .name)
+        dbg_windows "${WINDOWS_NAME}"
+        VERSION_ID=$(echo "${LATEST_WINDOWS_VERSION}" | jq -r .version_id)
+        dbg_windows "${VERSION_ID}"
+
+        case ${RELEASE} in
+            8) EDITION_ID=$(wget -4 -q -O- "https://tb.rg-adguard.net/php/get_edition.php?version_id=${VERSION_ID}&lang=name_${LANG_CODE}" | jq -r '.editions[] | select(.name_'${LANG_CODE}'=="Windows 8.1 Pro + Core").edition_id');;
+            10|11) EDITION_ID=$(wget -4 -q -O- "https://tb.rg-adguard.net/php/get_edition.php?version_id=${VERSION_ID}&lang=name_${LANG_CODE}" | jq -r '.editions[] | select(.name_'${LANG_CODE}'=="Windows '"${RELEASE}"'").edition_id');;
+        esac
+        dbg_windows "${EDITION_ID}"
+
+        LANGUAGE_ID=$(wget -4 -q -O- "https://tb.rg-adguard.net/php/get_language.php?edition_id=${EDITION_ID}&lang=name_${LANG_CODE}" | jq -r '.languages[] | select(.name_'${LANG_CODE}'=="'"${LANG_EDITION}"'").language_id')
+        dbg_windows "${LANGUAGE_ID}"
+        ARCH_INFO=$(wget -4 -q -O- "https://tb.rg-adguard.net/php/get_arch.php?language_id=${LANGUAGE_ID}")
+        dbg_windows "${ARCH_INFO}"
+        FILE_NAME=$(echo "${ARCH_INFO}" | jq -r '.archs[] | select(.name | contains("'${ARCH}'")).name')
+        dbg_windows "${FILE_NAME}"
+        ARCH_ID=$(echo "${ARCH_INFO}" | jq -r '.archs[] | select(.name | contains("'${ARCH}'")).arch_id')
+        dbg_windows "${ARCH_ID}"
+        DOWNLOAD_INFO=$(wget -4 -q -O- "https://tb.rg-adguard.net/dl.php?fileName=${ARCH_ID}&lang=en")
+        dbg_windows "${DOWNLOAD_INFO}"
+        DOWNLOAD_SHA1=$(echo "${DOWNLOAD_INFO}" | sed -e 's/<[^>]*>//g' | grep -o -P '(?<=SHA1: ).*(?= expire)' | sed 's/Link//')
+        dbg_windows "${DOWNLOAD_SHA1}"
+        DOWNLOAD_ID=$(echo "${DOWNLOAD_INFO}" | grep -oP '(?<=https:\/\/tb\.rg-adguard\.net/dl\.php\?go=)[0-9a-z]+')
+        dbg_windows "${DOWNLOAD_ID}"
+        REDIRECT_URL="https://tb.rg-adguard.net/dl.php?go=${DOWNLOAD_ID}"
+        dbg_windows "${REDIRECT_URL}"
+        DOWNLOAD_URL=$(curl --head --silent --write-out "%{redirect_url}\n" --output /dev/null "${REDIRECT_URL}")
+        dbg_windows "${DOWNLOAD_URL}"
+
+        MS_BASE_URL="https://software.download.prss.microsoft.com/"
+        if [[ ! ${DOWNLOAD_URL} =~ ^${MS_BASE_URL} ]]; then
+            echo "Download URL not leading to Microsoft CDN"
+            exit 1
+        fi
 
-    echo "Downloading ${WINDOWS_NAME}..."
-    web_get "${DOWNLOAD_URL}" "${VM_PATH}" "${FILE_NAME}"
+        echo "Downloading ${WINDOWS_NAME}..."
+        web_get "${DOWNLOAD_URL}" "${VM_PATH}" "${FILE_NAME}"
 
-    # Windows 10 doesn't include a SHA1, so only check the integrity if the SHA1 is available.
-    if [ -n "${DOWNLOAD_SHA1}" ]; then
-      check_hash "${FILE_NAME}" "${DOWNLOAD_SHA1}"
+        # Windows 10 doesn't include a SHA1, so only check the integrity if the SHA1 is available.
+        if [ -n "${DOWNLOAD_SHA1}" ]; then
+            check_hash "${FILE_NAME}" "${DOWNLOAD_SHA1}"
+        fi
+    else
+        case ${RELEASE} in
+            10) WINDOWS_ISO_URL="https://www.microsoft.com/software-download/windows10";;
+            11) WINDOWS_ISO_URL="https://www.microsoft.com/software-download/windows11";;
+        esac
+        echo "######################################################################"
+        echo "# Download a Windows ${RELEASE} .iso image from:"
+        echo "#  - ${WINDOWS_ISO_URL}"
+        echo "# Put the .iso image in the ${VM_PATH} directory and rename"
+        echo "# it to windows-${RELEASE}.iso."
+        echo "######################################################################"
     fi
 
     web_get "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso" "${VM_PATH}"
@@ -1991,7 +2011,11 @@ function get_windows() {
             mkisofs -quiet -l -o "${VM_PATH}/unattended.iso" "${VM_PATH}/unattended/"
             ;;
     esac
-    make_vm_config "${FILE_NAME}" "virtio-win.iso"
+
+    case "${API_GUIDED_DOWNLOAD}" in
+        0) make_vm_config "windows-${RELEASE}.iso" "virtio-win.iso";;
+        1) make_vm_config "${FILE_NAME}" "virtio-win.iso";;
+    esac
 }
 
 create_vm() {

From 61b73b63773fffdb4e05e43534d1684b816f0773 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <code@flexion.org>
Date: Sat, 4 Feb 2023 00:16:01 +0000
Subject: [PATCH 34/36] Update README

---
 README.md | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 9e401eb..39c022f 100644
--- a/README.md
+++ b/README.md
@@ -452,13 +452,12 @@ Now reboot, and the App Store should work.
 
 ## Windows 8.1, 10 & 11 Guests
 
-`quickget` can automatically download Windows 8.1, [Windows
-10](https://www.microsoft.com/en-gb/software-download/windows10ISO) and
-[Windows
-11](https://www.microsoft.com/en-gb/software-download/windows11) along
-with the [VirtIO drivers for
-Windows](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/)
-and creates a virtual machine configuration.
+`quickget` can not download
+[Windows10](https://www.microsoft.com/software-download/windows10) and
+[Windows 11](https://www.microsoft.com/software-download/windows11) automatically,
+but does automatically create an optimised virtual machine configuration that
+you can just add an Windows .iso image to. This configuration also includes the
+[VirtIO drivers for Windows](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/).
 
 ``` bash
 quickget windows 11
@@ -472,22 +471,12 @@ quickemu --vm windows-11.conf
     -   Username: `Quickemu`
     -   Password: `quickemu`
 
-### Regional versions
-
-By default `quickget` will download the *"English International"*
-release, but you can optionally specify one of the supported languages:
-For example:
-
-``` bash
-quickget windows 11 "Chinese (Traditional)"
-```
-
 The default Windows 11 configuration looks like this:
 
 ``` bash
 guest_os="windows"
 disk_img="windows-11/disk.qcow2"
-iso="windows-11/Win11_EnglishInternational_x64.iso"
+iso="windows-11/windows-11.iso"
 fixed_iso="windows-11/virtio-win.iso"
 tpm="on"
 secureboot="on"

From bacb7b1a8f5a61e741036a421366ef481bc357d3 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <code@flexion.org>
Date: Sat, 4 Feb 2023 00:24:24 +0000
Subject: [PATCH 35/36] Bump the version to 4.6

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

diff --git a/quickemu b/quickemu
index 3cb2e87..79ee129 100755
--- a/quickemu
+++ b/quickemu
@@ -1502,7 +1502,7 @@ EXTRA_ARGS=""
 # shellcheck disable=SC2155
 readonly LAUNCHER=$(basename "${0}")
 readonly DISK_MIN_SIZE=$((197632 * 8))
-readonly VERSION="4.5"
+readonly VERSION="4.6"
 
 # TODO: Make this run the native architecture binary
 QEMU=$(command -v qemu-system-x86_64)

From c69fa6b43041713643dc9f8fd4002f873de9f456 Mon Sep 17 00:00:00 2001
From: Phil Clifford <philip.clifford@gmail.com>
Date: Sat, 4 Feb 2023 00:27:00 +0000
Subject: [PATCH 36/36] Win notes added to man pages

---
 README.md               | 20 ++++++++++++++------
 build-docs              |  2 +-
 docs/quickemu.1         | 26 +++++++++++---------------
 docs/quickemu.1.md      | 23 ++++++++++-------------
 docs/quickemu_conf.1    |  2 +-
 docs/quickemu_conf.1.md |  2 +-
 docs/quickget.1         | 24 ++++++++++--------------
 docs/quickget.1.md      | 23 ++++++++++-------------
 8 files changed, 58 insertions(+), 64 deletions(-)

diff --git a/README.md b/README.md
index 39c022f..7915831 100644
--- a/README.md
+++ b/README.md
@@ -450,14 +450,22 @@ sudo rm /Library/Preferences/SystemConfiguration/NetworkInterfaces.plist
 
 Now reboot, and the App Store should work.
 
-## Windows 8.1, 10 & 11 Guests
+## Windows 10 & 11 Guests
 
 `quickget` can not download
 [Windows10](https://www.microsoft.com/software-download/windows10) and
-[Windows 11](https://www.microsoft.com/software-download/windows11) automatically,
-but does automatically create an optimised virtual machine configuration that
-you can just add an Windows .iso image to. This configuration also includes the
-[VirtIO drivers for Windows](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/).
+[Windows 11](https://www.microsoft.com/software-download/windows11)
+automatically, but does automatically create an optimised virtual
+machine configuration that you can just add an Windows .iso image to.
+This configuration also includes the [VirtIO drivers for
+Windows](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/).
+`quickget` can automatically download Windows 8.1, [Windows
+10](https://www.microsoft.com/en-gb/software-download/windows10ISO) and
+[Windows
+11](https://www.microsoft.com/en-gb/software-download/windows11) along
+with the [VirtIO drivers for
+Windows](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/)
+and creates a virtual machine configuration.
 
 ``` bash
 quickget windows 11
@@ -769,9 +777,9 @@ You can also pass optional parameters
   --extra_args <arguments>          : Pass additional arguments to qemu
   --version                         : Print version
 
+```
 <!-- [[[end]]] -->
 ```
-
 ## Desktop shortcuts
 
 Desktop shortcuts can be created for a VM, the shortcuts are saved in
diff --git a/build-docs b/build-docs
index 297a1d4..43c38df 160000
--- a/build-docs
+++ b/build-docs
@@ -1 +1 @@
-Subproject commit 297a1d4403ca0ddda062fdd086f4a00c8357452e
+Subproject commit 43c38df5ef08bada423b076274604951d5c13c0d
diff --git a/docs/quickemu.1 b/docs/quickemu.1
index 7d92369..39cefe8 100644
--- a/docs/quickemu.1
+++ b/docs/quickemu.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKEMU" "1" "February 3, 2023" "quickemu" "Quickemu User Manual"
+.TH "QUICKEMU" "1" "February 4, 2023" "quickemu" "Quickemu User Manual"
 .hy
 .SH NAME
 .PP
@@ -677,8 +677,15 @@ sudo rm /Library/Preferences/SystemConfiguration/NetworkInterfaces.plist
 .fi
 .PP
 Now reboot, and the App Store should work.
-.SS Windows 8.1, 10 & 11 Guests
-.PP
+.SS Windows 10 & 11 Guests
+.PP
+\f[V]quickget\f[R] can not download
+Windows10 (https://www.microsoft.com/software-download/windows10) and
+Windows 11 (https://www.microsoft.com/software-download/windows11)
+automatically, but does automatically create an optimised virtual
+machine configuration that you can just add an Windows .iso image to.
+This configuration also includes the VirtIO drivers for
+Windows (https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/).
 \f[V]quickget\f[R] can automatically download Windows 8.1, Windows
 10 (https://www.microsoft.com/en-gb/software-download/windows10ISO) and
 Windows 11 (https://www.microsoft.com/en-gb/software-download/windows11)
@@ -705,17 +712,6 @@ Username: \f[V]Quickemu\f[R]
 .IP \[bu] 2
 Password: \f[V]quickemu\f[R]
 .RE
-.SS Regional versions
-.PP
-By default \f[V]quickget\f[R] will download the \f[I]\[lq]English
-International\[rq]\f[R] release, but you can optionally specify one of
-the supported languages: For example:
-.IP
-.nf
-\f[C]
-quickget windows 11 \[dq]Chinese (Traditional)\[dq]
-\f[R]
-.fi
 .PP
 The default Windows 11 configuration looks like this:
 .IP
@@ -723,7 +719,7 @@ The default Windows 11 configuration looks like this:
 \f[C]
 guest_os=\[dq]windows\[dq]
 disk_img=\[dq]windows-11/disk.qcow2\[dq]
-iso=\[dq]windows-11/Win11_EnglishInternational_x64.iso\[dq]
+iso=\[dq]windows-11/windows-11.iso\[dq]
 fixed_iso=\[dq]windows-11/virtio-win.iso\[dq]
 tpm=\[dq]on\[dq]
 secureboot=\[dq]on\[dq]
diff --git a/docs/quickemu.1.md b/docs/quickemu.1.md
index 698bfd0..54a8c1b 100644
--- a/docs/quickemu.1.md
+++ b/docs/quickemu.1.md
@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: February 3, 2023
+date: February 4, 2023
 footer: quickemu
 header: Quickemu User Manual
 section: 1
@@ -480,8 +480,15 @@ sudo rm /Library/Preferences/SystemConfiguration/NetworkInterfaces.plist
 
 Now reboot, and the App Store should work.
 
-## Windows 8.1, 10 & 11 Guests
+## Windows 10 & 11 Guests
 
+`quickget` can not download
+[Windows10](https://www.microsoft.com/software-download/windows10) and
+[Windows 11](https://www.microsoft.com/software-download/windows11)
+automatically, but does automatically create an optimised virtual
+machine configuration that you can just add an Windows .iso image to.
+This configuration also includes the [VirtIO drivers for
+Windows](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/).
 `quickget` can automatically download Windows 8.1, [Windows
 10](https://www.microsoft.com/en-gb/software-download/windows10ISO) and
 [Windows
@@ -502,22 +509,12 @@ quickemu --vm windows-11.conf
     -   Username: `Quickemu`
     -   Password: `quickemu`
 
-### Regional versions
-
-By default `quickget` will download the *"English International"*
-release, but you can optionally specify one of the supported languages:
-For example:
-
-``` bash
-quickget windows 11 "Chinese (Traditional)"
-```
-
 The default Windows 11 configuration looks like this:
 
 ``` bash
 guest_os="windows"
 disk_img="windows-11/disk.qcow2"
-iso="windows-11/Win11_EnglishInternational_x64.iso"
+iso="windows-11/windows-11.iso"
 fixed_iso="windows-11/virtio-win.iso"
 tpm="on"
 secureboot="on"
diff --git a/docs/quickemu_conf.1 b/docs/quickemu_conf.1
index fa462dd..a66ef36 100644
--- a/docs/quickemu_conf.1
+++ b/docs/quickemu_conf.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKEMU_CONF" "1" "February 3, 2023" "quickemu_conf" "Quickemu Configuration Manual"
+.TH "QUICKEMU_CONF" "1" "February 4, 2023" "quickemu_conf" "Quickemu Configuration Manual"
 .hy
 .SH NAME
 .PP
diff --git a/docs/quickemu_conf.1.md b/docs/quickemu_conf.1.md
index abc6cd1..eb0db42 100644
--- a/docs/quickemu_conf.1.md
+++ b/docs/quickemu_conf.1.md
@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: February 3, 2023
+date: February 4, 2023
 footer: quickemu_conf
 header: Quickemu Configuration Manual
 section: 1
diff --git a/docs/quickget.1 b/docs/quickget.1
index e79fe6c..60484ee 100644
--- a/docs/quickget.1
+++ b/docs/quickget.1
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKGET" "1" "February 3, 2023" "quickget" "Quickget User Manual"
+.TH "QUICKGET" "1" "February 4, 2023" "quickget" "Quickget User Manual"
 .hy
 .SH NAME
 .PP
@@ -459,8 +459,15 @@ sudo rm /Library/Preferences/SystemConfiguration/NetworkInterfaces.plist
 .fi
 .PP
 Now reboot, and the App Store should work.
-.SS Windows 8.1, 10 & 11 Guests
+.SS Windows 10 & 11 Guests
 .PP
+\f[V]quickget\f[R] can not download
+Windows10 (https://www.microsoft.com/software-download/windows10) and
+Windows 11 (https://www.microsoft.com/software-download/windows11)
+automatically, but does automatically create an optimised virtual
+machine configuration that you can just add an Windows .iso image to.
+This configuration also includes the VirtIO drivers for
+Windows (https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/).
 \f[V]quickget\f[R] can automatically download Windows 8.1, Windows
 10 (https://www.microsoft.com/en-gb/software-download/windows10ISO) and
 Windows 11 (https://www.microsoft.com/en-gb/software-download/windows11)
@@ -487,17 +494,6 @@ Username: \f[V]Quickemu\f[R]
 .IP \[bu] 2
 Password: \f[V]quickemu\f[R]
 .RE
-.SS Regional versions
-.PP
-By default \f[V]quickget\f[R] will download the \f[I]\[lq]English
-International\[rq]\f[R] release, but you can optionally specify one of
-the supported languages: For example:
-.IP
-.nf
-\f[C]
-quickget windows 11 \[dq]Chinese (Traditional)\[dq]
-\f[R]
-.fi
 .PP
 The default Windows 11 configuration looks like this:
 .IP
@@ -505,7 +501,7 @@ The default Windows 11 configuration looks like this:
 \f[C]
 guest_os=\[dq]windows\[dq]
 disk_img=\[dq]windows-11/disk.qcow2\[dq]
-iso=\[dq]windows-11/Win11_EnglishInternational_x64.iso\[dq]
+iso=\[dq]windows-11/windows-11.iso\[dq]
 fixed_iso=\[dq]windows-11/virtio-win.iso\[dq]
 tpm=\[dq]on\[dq]
 secureboot=\[dq]on\[dq]
diff --git a/docs/quickget.1.md b/docs/quickget.1.md
index 24abbca..c3e72e6 100644
--- a/docs/quickget.1.md
+++ b/docs/quickget.1.md
@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: February 3, 2023
+date: February 4, 2023
 footer: quickget
 header: Quickget User Manual
 section: 1
@@ -312,8 +312,15 @@ sudo rm /Library/Preferences/SystemConfiguration/NetworkInterfaces.plist
 
 Now reboot, and the App Store should work.
 
-## Windows 8.1, 10 & 11 Guests
+## Windows 10 & 11 Guests
 
+`quickget` can not download
+[Windows10](https://www.microsoft.com/software-download/windows10) and
+[Windows 11](https://www.microsoft.com/software-download/windows11)
+automatically, but does automatically create an optimised virtual
+machine configuration that you can just add an Windows .iso image to.
+This configuration also includes the [VirtIO drivers for
+Windows](https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/).
 `quickget` can automatically download Windows 8.1, [Windows
 10](https://www.microsoft.com/en-gb/software-download/windows10ISO) and
 [Windows
@@ -334,22 +341,12 @@ quickemu --vm windows-11.conf
     -   Username: `Quickemu`
     -   Password: `quickemu`
 
-### Regional versions
-
-By default `quickget` will download the *"English International"*
-release, but you can optionally specify one of the supported languages:
-For example:
-
-``` bash
-quickget windows 11 "Chinese (Traditional)"
-```
-
 The default Windows 11 configuration looks like this:
 
 ``` bash
 guest_os="windows"
 disk_img="windows-11/disk.qcow2"
-iso="windows-11/Win11_EnglishInternational_x64.iso"
+iso="windows-11/windows-11.iso"
 fixed_iso="windows-11/virtio-win.iso"
 tpm="on"
 secureboot="on"