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 MX Linux support

Browse source 
MX Linux is listed once. XFCE is the default desktop, but KDE and FLuxbox can be selected as editions.
This commit is contained in:
Martin Wimpress 2022-02-21 04:35:33 +00:00
parent 21f7c0fa51
commit b5dc52265f
No known key found for this signature in database
GPG key ID: 61DF940515E06DA3
1 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

45
quickget
View file

@ -49,9 +49,7 @@ 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";;
mxlinux-xfce) PRETTY_NAME="MX Linux XFCE";; mxlinux) PRETTY_NAME="MX Linux";;
mxlinux-kde) PRETTY_NAME="MX Linux KDE";;
mxlinux-fluxbox) PRETTY_NAME="MX Linux Fluxbox";;
nixos-gnome) PRETTY_NAME="NixOS Gnome";; nixos-gnome) PRETTY_NAME="NixOS Gnome";;
nixos-plasma5) PRETTY_NAME="NixOS KDE";; nixos-plasma5) PRETTY_NAME="NixOS KDE";;
nixos-minimal) PRETTY_NAME="NixOS Minimal";; nixos-minimal) PRETTY_NAME="NixOS Minimal";;
@ -120,10 +118,6 @@ function list_csv() {
FUNC="ubuntu" FUNC="ubuntu"
elif [[ "${OS}" == *"linuxmint"* ]]; then elif [[ "${OS}" == *"linuxmint"* ]]; then
FUNC="linuxmint" FUNC="linuxmint"
elif [[ "${OS}" == *"manjaro"* ]]; then
FUNC="manjaro"
elif [[ "${OS}" == *"mxlinux"* ]]; then
FUNC="mxlinux"
elif [[ "${OS}" == *"nixos"* ]]; then elif [[ "${OS}" == *"nixos"* ]]; then
FUNC="nixos" FUNC="nixos"
else else
@ -160,6 +154,10 @@ function list_csv() {
for OPTION in cinnamon gnome kde lxde lxqt mate standard xfce; do for OPTION in cinnamon gnome kde lxde lxqt mate standard xfce; do
echo "${DISPLAY_NAME},${OS},${RELEASE},${OPTION},${DOWNLOADER},${PNG},${SVG}" echo "${DISPLAY_NAME},${OS},${RELEASE},${OPTION},${DOWNLOADER},${PNG},${SVG}"
done done
elif [ "${OS}" == "mxlinux" ]; then
for OPTION in xfce kde fluxbox; do
echo "${DISPLAY_NAME},${OS},${RELEASE},${OPTION},${DOWNLOADER},${PNG},${SVG}"
done
elif [ "${OS}" == "popos" ]; then elif [ "${OS}" == "popos" ]; then
for OPTION in intel nvidia; do for OPTION in intel nvidia; do
echo "${DISPLAY_NAME},${OS},${RELEASE},${OPTION},${DOWNLOADER},${PNG},${SVG}" echo "${DISPLAY_NAME},${OS},${RELEASE},${OPTION},${DOWNLOADER},${PNG},${SVG}"
@ -195,9 +193,7 @@ function os_support() {
linuxmint-mate \ linuxmint-mate \
linuxmint-xfce \ linuxmint-xfce \
manjaro \ manjaro \
mxlinux-xfce \ mxlinux \
mxlinux-kde \
mxlinux-fluxbox \
nixos-gnome \ nixos-gnome \
nixos-plasma5 \ nixos-plasma5 \
nixos-minimal \ nixos-minimal \
@ -1010,14 +1006,17 @@ function get_manjaro() {
} }
function get_mxlinux() { function get_mxlinux() {
local FLAVOR="" local DESKTOP="xfce"
local HASH="" local HASH=""
local ISO="" local ISO=""
local URL="" local URL=""
if [ -n "${1}" ]; then
DESKTOP="${1}"
fi
validate_release "releases_mxlinux" validate_release "releases_mxlinux"
FLAVOR=$(echo "${OS}" | cut -d'-' -f2) case ${DESKTOP} in
case ${FLAVOR} in
xfce) xfce)
URL="https://sourceforge.net/projects/mx-linux/files/Final/Xfce" URL="https://sourceforge.net/projects/mx-linux/files/Final/Xfce"
ISO="MX-${RELEASE}_x64.iso" ISO="MX-${RELEASE}_x64.iso"
@ -1914,8 +1913,22 @@ if [ -n "${2}" ]; 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 if [ -n "${3}" ]; then
DESKTOP="${3}"
DESKTOPS=(xfce kde fluxbox)
if [[ ! ${DESKTOPS[*]} =~ ${DESKTOP} ]]; then
echo "ERROR! ${DESKTOP} is not a supported Desktop Environment:"
for DESKTOP in "${DESKTOPS[@]}"; do
echo "${DESKTOP}"
done
exit 1
fi
else
DESKTOP="xfce"
fi
VM_PATH="${OS}-${RELEASE}-${DESKTOP}"
get_mxlinux "${DESKTOP}"
elif [[ "${OS}" == *"nixos-"* ]]; then elif [[ "${OS}" == *"nixos-"* ]]; then
get_nixos get_nixos
elif [ "${OS}" == "openbsd" ]; then elif [ "${OS}" == "openbsd" ]; then
@ -2011,7 +2024,7 @@ else
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
elif [[ "${OS}" == *"nixos-"* ]]; then elif [[ "${OS}" == *"nixos-"* ]]; then
releases_nixos releases_nixos