From 0e6ad3d1f77f4ec1744c754a9d5fc889b03ddd62 Mon Sep 17 00:00:00 2001
From: Martin Wimpress <code@flexion.org>
Date: Mon, 21 Feb 2022 01:58:35 +0000
Subject: [PATCH] Refactor get_manjaro()

---
 quickget | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/quickget b/quickget
index f76b94e..b790419 100755
--- a/quickget
+++ b/quickget
@@ -995,34 +995,38 @@ function get_linuxmint() {
 function get_manjaro() {
     local FLAVOR=""
     local MANIFESTURL=""
-#    local ISOKEY=""
-    local HASHKEY=""
     local HASH=""
     local ISO=""
+    local KEY_ISO=""
+    local KEY_HASH=""
     local URL=""
 
     validate_release "releases_manjaro"
     FLAVOR=$(echo "${OS}" | cut -d'-' -f2)
     case ${FLAVOR} in
-      xfce|kde|gnome) BRANCH="official";;
+      gnome|kde|xfce) BRANCH="official";;
       budgie|cinnamon|deepin|i3|mate) BRANCH="community";;
     esac
 
-    if [[ ${RELEASE} == "full" ]]; then
-      KEY="Download_x64 = "
-      HASHKEY="Download_x64_Checksum = "
-    elif [[ ${RELEASE} == "minimal" ]]; then
-      KEY="Download_Minimal_x64 = "
-      HASHKEY="Download_Minimal_x64_Checksum = "
-    elif [[ ${RELEASE} == "minimal" ]]; then
-      KEY="Download_Minimal_lts = "
-      HASHKEY="Download_Minimal_x64_Checksum_lts = "
-    fi
+    case ${RELEASE} in
+      full)
+        KEY_ISO="Download_x64 ="
+        KEY_HASH="Download_x64_Checksum ="
+        ;;
+      minimal)
+        KEY_ISO="Download_Minimal_x64 ="
+        KEY_HASH="Download_Minimal_x64_Checksum ="
+        ;;
+      minimal-lts)
+        KEY_ISO="Download_Minimal_lts ="
+        KEY_HASH="Download_Minimal_x64_Checksum_lts ="
+        ;;
+    esac
 
     MANIFESTURL="https://gitlab.manjaro.org/webpage/manjaro-homepage/-/raw/master/site/content/downloads/${BRANCH}/${FLAVOR}.md"
-    URL="$(wget -qO- ${MANIFESTURL} | grep "${KEY}" | awk '{print $3}' | tr -d '"')"
-    ISO="$(echo $URL | awk -F "/" '{print $6}')"
-    HASH=$(wget -qO- ${MANIFESTURL} | grep "${HASHKEY}" | awk '{print $3}' | tr -d '"')
+    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}"