From 6f88ffedbcca77d825f4f0ae9b7321331c9d0f32 Mon Sep 17 00:00:00 2001
From: Liam <33645555+lj3954@users.noreply.github.com>
Date: Tue, 16 Apr 2024 22:57:40 -0700
Subject: [PATCH] Fix HoloISO downloads - closes #1062

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

diff --git a/quickget b/quickget
index b7a5ab7..18c0e85 100755
--- a/quickget
+++ b/quickget
@@ -992,7 +992,7 @@ function editions_haiku() {
 }
 
 function releases_holoiso() {
-    wget -q https://github.com/HoloISO/holoiso/releases/latest -O- | grep -o -e 'releases/tag/[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]' | head -1 | cut -d/ -f3
+    wget -q https://github.com/HoloISO/releases/releases/latest -O- | grep -o -e 'releases/tag/[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]' | head -1 | cut -d/ -f3
 }
 
 function releases_kali() {
@@ -1441,10 +1441,6 @@ function web_get() {
         echo Downloading $(pretty_name "${OS}") ${RELEASE} ${EDITION:+ $EDITION}: ${FILE}
     fi
 
-    if [ "${OS}" != "macos" ]; then
-      USER_AGENT="InternetRecovery/1.0"
-    fi
-
     if command -v curl &>/dev/null; then
         if ! curl --progress-bar --location --output "${DIR}/${FILE}" --continue-at - --user-agent "${USER_AGENT}" "${HEADERS[@]}" -- "${URL}"; then
             echo "ERROR! Failed to download ${URL} with curl."
@@ -2267,11 +2263,9 @@ function get_haiku() {
 
 function get_holoiso() {
     #local HASH=""
-    local ISO=$(wget -q -O- "https://api.github.com/repos/HoloISO/holoiso/releases" | sed 's/ /\n/g' | grep "HoloISO_${RELEASES}" | cut -d'\' -f1 | cut -d'/' -f4)
-    local URL="https://cd2.holoiso.ru.eu.org"
-    # Can't find hash
-    #HASH=$(wget -q -O- "${URL}/${ISO}.sha256sum" | cut -d' ' -f1)
-    echo "${URL}/${ISO} #${HASH}"
+    local URL
+    URL=$(wget -q -O- "https://api.github.com/repos/HoloISO/releases/releases" | jq ".[] | select(.tag_name==\"${RELEASE}\") | .body" | grep -Po "https://\S+holoiso.ru.eu.org/\S+.iso" | head -n 1)
+    echo "${URL}"
 }
 
 function get_kali() {