From 599aa0769640e50b4f825cddc0a1b9ebadb5ad20 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Wed, 29 Dec 2021 18:06:58 +0530 Subject: [PATCH 1/5] Add manjaro support --- quickget | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/quickget b/quickget index 235fd9a..ac7dbfb 100755 --- a/quickget +++ b/quickget @@ -45,6 +45,14 @@ function pretty_name() { linuxmint-cinnamon) PRETTY_NAME="Linux Mint Cinnamon";; linuxmint-mate) PRETTY_NAME="Linux Mint MATE";; linuxmint-xfce) PRETTY_NAME="Linux Mint XFCE";; + manjaro-xfce) PRETTY_NAME="Manjaro XFCE";; + manjaro-kde) PRETTY_NAME="Manjaro KDE";; + manjaro-gnome) PRETTY_NAME="Manjaro Gnome";; + manjaro-budgie) PRETTY_NAME="Manjaro Budgie";; + manjaro-cinnamon) PRETTY_NAME="Manjaro Cinnamon";; + manjaro-deepin) PRETTY_NAME="Manjaro Deepin";; + manjaro-i3) PRETTY_NAME="Manjaro i3";; + manjaro-mate) PRETTY_NAME="Manjaro MATE";; nixos-gnome) PRETTY_NAME="NixOS Gnome";; nixos-plasma5) PRETTY_NAME="NixOS KDE";; nixos-minimal) PRETTY_NAME="NixOS Minimal";; @@ -111,6 +119,8 @@ function list_csv() { FUNC="ubuntu" elif [[ "${OS}" == *"linuxmint"* ]]; then FUNC="linuxmint" + elif [[ "${OS}" == *"manjaro"* ]]; then + FUNC="manjaro" elif [[ "${OS}" == *"nixos"* ]]; then FUNC="nixos" else @@ -174,6 +184,14 @@ function os_support() { linuxmint-cinnamon \ linuxmint-mate \ linuxmint-xfce \ + manjaro-xfce \ + manjaro-kde \ + manjaro-gnome \ + manjaro-budgie \ + manjaro-cinnamon \ + manjaro-deepin \ + manjaro-i3 \ + manjaro-mate \ nixos-gnome \ nixos-plasma5 \ nixos-minimal \ @@ -314,6 +332,16 @@ function releases_macos() { monterey } +function releases_manjaro() { + case ${OS} in + *xfce|*kde|*gnome) echo full \ + minimal \ + minimal-lts;; + *budgie|*cinnamon|*deepin|*i3|*mate) echo full \ + minimal;; + esac +} + function releases_popos() { echo 20.04 \ 21.04 @@ -543,6 +571,9 @@ function make_vm_config() { elif [[ "${OS}" == *"linuxmint"* ]]; then GUEST="linux" IMAGE_TYPE="iso" + elif [[ "${OS}" == *"manjaro"* }}; then + GUEST="linux" + IMAGE_TYPE="iso" elif [[ "${OS}" == *"nixos"* ]]; then GUEST="linux" IMAGE_TYPE="iso" @@ -843,6 +874,42 @@ function get_linuxmint() { check_hash "${ISO}" "${HASH}" make_vm_config "${ISO}" } + +function get_manjaro() { + local FLAVOR="" + 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";; + esac + if [[ ${RELEASE} == "full" ]]; then + ISO="manjaro-${FLAVOR}-${VER}-${DATE}-linux${KERNEL}.iso" + 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" + fi + URL="https://download.manjaro.org/${FLAVOR}/${VER}/${ISO}" + web_get "${URL}" "${VM_PATH}" + make_vm_config "${ISO}" +} + function get_nixos() { local FLAVOR="" local HASH="" @@ -1659,6 +1726,8 @@ if [ -n "${2}" ]; then get_kdeneon elif [[ "${OS}" == *"linuxmint-"* ]]; then get_linuxmint + elif [[ "${OS}" == *"manjaro-"* ]]; then + get_manjaro elif [[ "${OS}" == *"nixos-"* ]]; then get_nixos elif [ "${OS}" == "openbsd" ]; then @@ -1667,7 +1736,7 @@ if [ -n "${2}" ]; then get_opensuse elif [ "${OS}" == "oraclelinux" ]; then get_oraclelinux - elif [ "${OS}" == "popos" ]; then + elif [ "${OS}" == "popos" ]; then if [ -n "${3}" ]; then DRIVER="${3}" DRIVERS=(intel nvidia) @@ -1748,6 +1817,8 @@ else releases_kali elif [[ "${OS}" == *"linuxmint-"* ]]; then releases_linuxmint + elif [[ "${OS}" == *"manjaro-"* ]]; then + releases_manjaro elif [[ "${OS}" == *"nixos-"* ]]; then releases_nixos elif [ "${OS}" == "opensuse" ]; then From 545fd393921556477450295db466cdd4c5fc8d54 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Wed, 29 Dec 2021 23:48:06 +0530 Subject: [PATCH 2/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 78ac412..7929966 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ comprehensive support for macOS and Windows**. * [Fedora](https://getfedora.org/) & openSUSE ([Leap](https://get.opensuse.org/leap/), [Tumbleweed](https://get.opensuse.org/tumbleweed/), [MicroOS](https://microos.opensuse.org/)) * [Alma Linux](https://almalinux.org/) * [Linux Mint](https://linuxmint.com/) (Cinnamon, MATE, and XFCE), [elementary OS](https://elementary.io/), [Pop!_OS](https://pop.system76.com/) - * [Arch Linux](https://www.archlinux.org/), [Kali](https://www.kali.org/),[Garuda](https://garudalinux.org/), [ZorinOS](https://zorin.com/os/) & [NixOS](https://nixos.org/) + * [Arch Linux](https://www.archlinux.org/), [Kali](https://www.kali.org/),[Garuda](https://garudalinux.org/), [ZorinOS](https://zorin.com/os/), [Manjaro](https://manjaro.org) & [NixOS](https://nixos.org/) * [Oracle Linux](https://www.oracle.com/linux/) and [Rocky Linux](https://rockylinux.org/) * [Regolith Linux](https://regolith-linux.org/) (Release 1.6 and latest 2.0.0 pre-release ) * [FreeBSD](https://www.freebsd.org/) & [OpenBSD](https://www.openbsd.org/) From 82885ef8c4146376cc7a1e1294f970077c35faa7 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Thu, 30 Dec 2021 16:06:22 +0530 Subject: [PATCH 3/5] Update quickget --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index ac7dbfb..f9bfaf0 100755 --- a/quickget +++ b/quickget @@ -571,7 +571,7 @@ function make_vm_config() { elif [[ "${OS}" == *"linuxmint"* ]]; then GUEST="linux" IMAGE_TYPE="iso" - elif [[ "${OS}" == *"manjaro"* }}; then + elif [[ "${OS}" == *"manjaro"* ]]; then GUEST="linux" IMAGE_TYPE="iso" elif [[ "${OS}" == *"nixos"* ]]; then 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 4/5] Auto Update Manjaro --- quickget | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) 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}" } From 7c21235ce8b9e6c0ef01d61cdcc1947924ec0ed7 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Sat, 1 Jan 2022 11:58:38 +0530 Subject: [PATCH 5/5] fix Manjaro unable to download iso --- quickget | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickget b/quickget index 6a5163c..e98803e 100755 --- a/quickget +++ b/quickget @@ -903,8 +903,8 @@ function get_manjaro() { fi 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 '"')" + 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 '"') web_get "${URL}" "${VM_PATH}" check_hash "${ISO}" "${HASH}"