diff --git a/quickget b/quickget index f9bfaf0..6a5163c 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}" }