From a9392062882ce0f649000e04f48a7a155fc1b422 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Mon, 21 Feb 2022 20:08:50 +0000 Subject: [PATCH] Refactor Garuda support to properly implement releases and editions --- quickget | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/quickget b/quickget index 3f1230e..951e759 100755 --- a/quickget +++ b/quickget @@ -284,20 +284,25 @@ function releases_freebsd(){ } function releases_garuda() { - echo bspwm \ - dr460nized \ + echo 220131 \ + 220220 +} + +function editions_garuda() { + echo dr460nized \ dr460nized-blackarch \ dr460nized-gaming \ + bspwm \ + cinnamon \ gnome \ i3 \ kde-barebones \ lxqt-kwin \ + mate \ qtile \ sway \ wayfire \ - xfce \ - mate \ - cinnamon + xfce } function releases_gentoo(){ @@ -910,28 +915,24 @@ function get_freebsd() { } function get_garuda() { - local DATE="" + local BRANCH="" + local EDITION="" local HASH="" local ISO="" - local URL="http://mirrors.fossho.st/garuda/iso" - local REL_TYPE="" - local LATEST_URL="" - local HASH_URL="" + local URL="" - case ${RELEASE} in - mate|cinnamon) - REL_TYPE="community";; - *) - REL_TYPE="garuda";; + if [ -n "${1}" ]; then + EDITION="${1}" + fi + + case ${EDITION} in + cinnamon|mate) BRANCH="community";; + *) BRANCH="garuda";; esac - # Follow daily releases and use SHA hash file to derive .iso and date - LATEST_URL="${URL}/latest/${REL_TYPE}/${RELEASE}/latest.iso.sha256" - HASH_URL="$(wget -q -O- "${LATEST_URL}")" - ISO="$(echo "${HASH_URL}" | awk '{print $NF}')" - HASH=$(echo "${HASH_URL}" | cut -d' ' -f1) - DATE=$(echo "${ISO}" | awk -F'-' '{print $NF}' | cut -d'.' -f1) - URL="${URL}/${REL_TYPE}/${RELEASE}/${DATE}" + URL="http://mirrors.fossho.st/garuda/iso/${BRANCH}/${EDITION}/${RELEASE}" + ISO="${OS}-${EDITION}-linux-zen-${RELEASE}.iso" + HASH="$(wget -q -O- "${URL}/${ISO}.sha256" | cut -d' ' -f1)" web_get "${URL}/${ISO}" "${VM_PATH}" check_hash "${ISO}" "${HASH}" make_vm_config "${OS}-${RELEASE}.iso"