oSoWoSo/DistroHopper
1
0
Fork 0
mirror of https://github.com/oSoWoSo/DistroHopper.git synced 2024-08-14 22:46:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor Manjaro support

Browse source 
Treat the desktop editions as release since Manjaro is rolling. Drop support for Minimal and Minimal LTS selection.
This commit is contained in:
Martin Wimpress 2022-02-21 04:23:29 +00:00
parent 2dbbe869d0
commit 21f7c0fa51
No known key found for this signature in database
GPG key ID: 61DF940515E06DA3
1 changed files with 15 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

61
quickget
View file

@ -49,14 +49,6 @@ function pretty_name() {
linuxmint-cinnamon) PRETTY_NAME="Linux Mint Cinnamon";; linuxmint-cinnamon) PRETTY_NAME="Linux Mint Cinnamon";;
linuxmint-mate) PRETTY_NAME="Linux Mint MATE";; linuxmint-mate) PRETTY_NAME="Linux Mint MATE";;
linuxmint-xfce) PRETTY_NAME="Linux Mint XFCE";; 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";;
mxlinux-xfce) PRETTY_NAME="MX Linux XFCE";; mxlinux-xfce) PRETTY_NAME="MX Linux XFCE";;
mxlinux-kde) PRETTY_NAME="MX Linux KDE";; mxlinux-kde) PRETTY_NAME="MX Linux KDE";;
mxlinux-fluxbox) PRETTY_NAME="MX Linux Fluxbox";; mxlinux-fluxbox) PRETTY_NAME="MX Linux Fluxbox";;
@ -202,14 +194,7 @@ function os_support() {
linuxmint-cinnamon \ linuxmint-cinnamon \
linuxmint-mate \ linuxmint-mate \
linuxmint-xfce \ linuxmint-xfce \
manjaro-xfce \ manjaro \
manjaro-kde \
manjaro-gnome \
manjaro-budgie \
manjaro-cinnamon \
manjaro-deepin \
manjaro-i3 \
manjaro-mate \
mxlinux-xfce \ mxlinux-xfce \
mxlinux-kde \ mxlinux-kde \
mxlinux-fluxbox \ mxlinux-fluxbox \
@ -387,13 +372,14 @@ function releases_macos() {
} }
function releases_manjaro() { function releases_manjaro() {
case ${OS} in echo xfce \
*xfce|*kde|*gnome) echo full \ gnome \
minimal \ kde \
minimal-lts;; budgie \
*budgie|*cinnamon|*deepin|*i3|*mate) echo full \ cinnamon \
minimal;; deepin \
esac i3 \
mate
} }
function releases_popos() { function releases_popos() {
@ -1001,37 +987,20 @@ function get_linuxmint() {
} }
function get_manjaro() { function get_manjaro() {
local FLAVOR=""
local MANIFESTURL="" local MANIFESTURL=""
local HASH="" local HASH=""
local ISO="" local ISO=""
local KEY_ISO="" local KEY_ISO="Download_x64 ="
local KEY_HASH="" local KEY_HASH="Download_x64_Checksum ="
local URL="" local URL=""
validate_release "releases_manjaro" validate_release "releases_manjaro"
FLAVOR=$(echo "${OS}" | cut -d'-' -f2) case ${RELEASE} in
case ${FLAVOR} in
gnome|kde|xfce) BRANCH="official";; gnome|kde|xfce) BRANCH="official";;
budgie|cinnamon|deepin|i3|mate) BRANCH="community";; budgie|cinnamon|deepin|i3|mate) BRANCH="community";;
esac esac
case ${RELEASE} in MANIFESTURL="https://gitlab.manjaro.org/webpage/manjaro-homepage/-/raw/master/site/content/downloads/${BRANCH}/${RELEASE}.md"
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_ISO}" | cut -d'"' -f2)" URL="$(wget -qO- "${MANIFESTURL}" | grep "${KEY_ISO}" | cut -d'"' -f2)"
ISO="${URL##*/}" ISO="${URL##*/}"
HASH=$(wget -qO- "${MANIFESTURL}" | grep "${KEY_HASH}" | cut -d'"' -f2) HASH=$(wget -qO- "${MANIFESTURL}" | grep "${KEY_HASH}" | cut -d'"' -f2)
@ -1943,7 +1912,7 @@ if [ -n "${2}" ]; then
get_kolibrios get_kolibrios
elif [[ "${OS}" == *"linuxmint-"* ]]; then elif [[ "${OS}" == *"linuxmint-"* ]]; then
get_linuxmint get_linuxmint
elif [[ "${OS}" == *"manjaro-"* ]]; then elif [ "${OS}" == "manjaro" ]; then
get_manjaro get_manjaro
elif [[ "${OS}" == *"mxlinux-"* ]]; then elif [[ "${OS}" == *"mxlinux-"* ]]; then
get_mxlinux get_mxlinux
@ -2040,7 +2009,7 @@ else
releases_kolibrios releases_kolibrios
elif [[ "${OS}" == *"linuxmint-"* ]]; then elif [[ "${OS}" == *"linuxmint-"* ]]; then
releases_linuxmint releases_linuxmint
elif [[ "${OS}" == *"manjaro-"* ]]; then elif [ "${OS}" == "manjaro" ]; then
releases_manjaro releases_manjaro
elif [[ "${OS}" == *"mxlinux-"* ]]; then elif [[ "${OS}" == *"mxlinux-"* ]]; then
releases_mxlinux releases_mxlinux