From e33900a81e6eafa1d1a7a5f9437f02f35664bc75 Mon Sep 17 00:00:00 2001
From: Jai A P <78354625+Jai-JAP@users.noreply.github.com>
Date: Sat, 1 Jan 2022 11:50:17 +0530
Subject: [PATCH] Auto Update Manjaro

---
 quickget | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/quickget b/quickget
index f9bfaf0783..6a5163ce26 100755
--- a/quickget
+++ b/quickget
@@ -877,36 +877,37 @@ function get_linuxmint() {
 
 function get_manjaro() {
     local FLAVOR=""
+    local MANIFESTURL=""
+    local ISOKEY=""
+    local HASHKEY=""
     local HASH=""
     local ISO=""
     local URL=""
-    local VER=""
-    local DATE=""
-    local KERNEL=""
-    local KERNLTS=""
-    
+        
     validate_release "releases_manjaro"
     FLAVOR=$(echo "${OS}" | cut -d'-' -f2)
     case ${FLAVOR} in
-      xfce|kde|gnome)
-        VER="21.2.0"
-        DATE="211220"
-        KERNEL="515"
-        KERNLTS="510";;
-      budgie|cinnamon|deepin|i3|mate)
-        VER="21.1.2"
-        DATE="210907"
-        KERNEL="513";;
+      xfce|kde|gnome) BRANCH="official";;
+      budgie|cinnamon|deepin|i3|mate) BRANCH="community";;
     esac
+    
     if [[ ${RELEASE} == "full" ]]; then
-        ISO="manjaro-${FLAVOR}-${VER}-${DATE}-linux${KERNEL}.iso"
+      KEY="Download_x64 = "
+      HASHKEY="Download_x64_Checksum = "
     elif [[ ${RELEASE} == "minimal" ]]; then
-        ISO="manjaro-${FLAVOR}-${VER}-minimal-${DATE}-linux${KERNEL}.iso"
-    elif [[ ${RELEASE} == "minimal-lts" ]]; then
-        ISO="manjaro-${FLAVOR}-${VER}-minimal-${DATE}-linux${KERNLTS}.iso"
+      KEY="Download_Minimal_x64 = "
+      HASHKEY="Download_Minimal_x64_Checksum = "
+    elif [[ ${RELEASE} == "minimal" ]]; then
+      KEY="Download_Minimal_lts = "
+      HASHKEY="Download_Minimal_x64_Checksum_lts = "
     fi
-    URL="https://download.manjaro.org/${FLAVOR}/${VER}/${ISO}"
+   
+    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}')
+    ISO="$(echo $URL | awk -F "/" '{print $6}' | tr -d '"')"
+    HASH=$(wget -qO- ${MANIFESTURL} | grep "${HASHKEY}" | awk '{print $3}' | tr -d '"')
     web_get "${URL}" "${VM_PATH}"
+    check_hash "${ISO}" "${HASH}"
     make_vm_config "${ISO}"
 }