From 6c957f6529ada7359882b7e1c3a4bff8f8a0e789 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@wimpress.org>
Date: Sun, 25 Jan 2026 00:34:07 +0000
Subject: [PATCH] feat(quickget): support Ubuntu desktop ARM64 from 25.10

- Add arch_ubuntu() to enumerate supported architectures and gate ARM64
by release
- Validate architecture once RELEASE is known and exit/skip if
unsupported
- Use UBUNTU_ARCH when selecting ISO lines and hashes instead of
hardcoded amd64
- Use cdimage.ubuntu.com releases path for Ubuntu ARM64 desktop ISOs
- Default non-numeric releases (daily, dvd, etc.) to amd64 only

Signed-off-by: Martin Wimpress <martin@wimpress.org>
---
 quickget | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/quickget b/quickget
index 5c27e4e..cbf331a 100755
--- a/quickget
+++ b/quickget
@@ -1398,6 +1398,30 @@ function arch_ubuntu-server() {
     echo "amd64 arm64"
 }
 
+function arch_ubuntu() {
+    # Ubuntu Desktop ARM64 only available from 25.10 onwards
+    local MAJOR MINOR
+    # When RELEASE is unset (initial arch check), return all supported architectures
+    # Actual validation happens in get_ubuntu() when release is known
+    if [ -z "${RELEASE}" ]; then
+        echo "amd64 arm64"
+        return
+    fi
+    # Non-numeric releases (daily-live, etc.) default to amd64 only
+    if [[ ! "${RELEASE}" =~ ^[0-9]+\.[0-9]+$ ]]; then
+        echo "amd64"
+        return
+    fi
+    MAJOR="${RELEASE%%.*}"
+    MINOR="${RELEASE##*.}"
+    # 25.10 and later support ARM64
+    if [ "${MAJOR}" -gt 25 ] || { [ "${MAJOR}" -eq 25 ] && [ "${MINOR}" -ge 10 ]; }; then
+        echo "amd64 arm64"
+    else
+        echo "amd64"
+    fi
+}
+
 # Check if a given architecture is supported for an OS
 function is_arch_supported() {
     local OS="${1}"
@@ -2986,10 +3010,22 @@ function get_ubuntu-server() {
 }
 
 function get_ubuntu() {
-    local ISO=""
-    local HASH=""
-    local URL=""
     local DATA=""
+    local HASH=""
+    local ISO=""
+    local UBUNTU_ARCH="${ARCH}"
+    local URL=""
+
+    # Validate architecture support now that RELEASE is known
+    if ! is_arch_supported "${OS}" "${UBUNTU_ARCH}"; then
+        if [ "${OPERATION}" == "test" ] || [ "${OPERATION}" == "show" ]; then
+            test_result "${OS}" "${RELEASE}" "" "" "SKIP" "(not available for ${UBUNTU_ARCH})"
+            exit 0
+        else
+            echo "ERROR! $(pretty_name "${OS}") ${RELEASE} is not available for ${UBUNTU_ARCH} architecture."
+            exit 1
+        fi
+    fi
 
     if [[ "${RELEASE}" == "daily"* ]] && [ "${OS}" == "ubuntustudio" ]; then
         # Ubuntu Studio daily-live images are in the dvd directory
@@ -3005,17 +3041,20 @@ function get_ubuntu() {
     elif [[ "${RELEASE}" == "daily"* ]] || [ "${RELEASE}" == "dvd" ]; then
         URL="https://cdimage.ubuntu.com/${OS}/${RELEASE}/current"
         VM_PATH="${OS}-${RELEASE}"
+    elif [ "${OS}" == "ubuntu" ] && [ "${UBUNTU_ARCH}" == "arm64" ]; then
+        # ARM64 desktop ISOs are hosted on cdimage.ubuntu.com
+        URL="https://cdimage.ubuntu.com/releases/${RELEASE}/release"
     elif [ "${OS}" == "ubuntu" ]; then
         URL="https://releases.ubuntu.com/${RELEASE}"
     else
         URL="https://cdimage.ubuntu.com/${OS}/releases/${RELEASE}/release"
     fi
     if web_check "${URL}/SHA256SUMS"; then
-        DATA=$(web_pipe "${URL}/SHA256SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | grep -v "+mac" | tail -n 1 )
+        DATA=$(web_pipe "${URL}/SHA256SUMS" | grep 'desktop\|dvd\|install' | grep "${UBUNTU_ARCH}" | grep iso | grep -v "+mac" | tail -n 1 )
         ISO=$(cut -d'*' -f2 <<<"${DATA}" | sed '1q;d')
         HASH=$(cut -d' ' -f1 <<<"${DATA}" | sed '1q;d')
     else
-        DATA=$(web_pipe "${URL}/MD5SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | grep -v "+mac" | tail -n 1 )
+        DATA=$(web_pipe "${URL}/MD5SUMS" | grep 'desktop\|dvd\|install' | grep "${UBUNTU_ARCH}" | grep iso | grep -v "+mac" | tail -n 1 )
         ISO=$(cut -d'*' -f2 <<<"${DATA}")
         HASH=$(cut -d' ' -f1 <<<"${DATA}")
     fi