From e57307e54adf6901939a974698bf05bb174159c0 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <code@flexion.org>
Date: Wed, 23 Feb 2022 10:42:57 +0000
Subject: [PATCH] Refactor get_manjaro() to add create_vm() compatibility

---
 quickget | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/quickget b/quickget
index 1161c7d..a623ab9 100755
--- a/quickget
+++ b/quickget
@@ -960,26 +960,19 @@ function get_macos() {
 }
 
 function get_manjaro() {
-    local BRANCH=""
     local HASH=""
     local ISO=""
-    local KEY_ISO="Download_x64 ="
-    local KEY_HASH="Download_x64_Checksum ="
     local MANIFESTURL=""
     local URL=""
 
     case ${RELEASE} in
-      gnome|kde|xfce) BRANCH="official";;
-      budgie|cinnamon|deepin|i3|mate) BRANCH="community";;
+      gnome|kde|xfce) MANIFESTURL="https://gitlab.manjaro.org/webpage/manjaro-homepage/-/raw/master/site/content/downloads/official/${RELEASE}.md";;
+      budgie|cinnamon|deepin|i3|mate) MANIFESTURL="https://gitlab.manjaro.org/webpage/manjaro-homepage/-/raw/master/site/content/downloads/community/${RELEASE}.md";;
     esac
 
-    MANIFESTURL="https://gitlab.manjaro.org/webpage/manjaro-homepage/-/raw/master/site/content/downloads/${BRANCH}/${RELEASE}.md"
-    URL="$(wget -qO- "${MANIFESTURL}" | grep "${KEY_ISO}" | cut -d'"' -f2)"
-    ISO="${URL##*/}"
-    HASH=$(wget -qO- "${MANIFESTURL}" | grep "${KEY_HASH}" | cut -d'"' -f2)
-    web_get "${URL}" "${VM_PATH}"
-    check_hash "${ISO}" "${HASH}"
-    make_vm_config "${ISO}"
+    URL="$(wget -qO- "${MANIFESTURL}" | grep "Download_x64 =" | cut -d'"' -f2)"
+    HASH=$(wget -qO- "${MANIFESTURL}" | grep "Download_x64_Checksum =" | cut -d'"' -f2)
+    echo "${URL} ${HASH}"
 }
 
 function get_mxlinux() {