mirror of
https://github.com/oSoWoSo/DistroHopper.git
synced 2024-08-14 22:46:53 +00:00
Refactor Linux Mint support. Treat DE variants as an OS use actual versions
This commit is contained in:
parent
59bd1ca309
commit
ca57afa111
1 changed files with 23 additions and 21 deletions
42
quickget
42
quickget
|
@ -10,13 +10,18 @@ function list_all() {
|
||||||
for OS in $(os_support); do
|
for OS in $(os_support); do
|
||||||
if [[ "${OS}" == *"ubuntu"* ]]; then
|
if [[ "${OS}" == *"ubuntu"* ]]; then
|
||||||
FUNC="ubuntu"
|
FUNC="ubuntu"
|
||||||
|
elif [[ "${OS}" == *"linuxmint"* ]]; then
|
||||||
|
FUNC="linuxmint"
|
||||||
else
|
else
|
||||||
FUNC="${OS}"
|
FUNC="${OS}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case ${OS} in
|
case ${OS} in
|
||||||
elementary) DISPLAY_NAME="elementary OS";;
|
elementary) DISPLAY_NAME="elementary OS";;
|
||||||
freebsd) DISPLAY_NAME="FreeBSD";;
|
freebsd) DISPLAY_NAME="FreeBSD";;
|
||||||
linuxmint) DISPLAY_NAME="Linux Mint";;
|
linuxmint-cinnamon) DISPLAY_NAME="Linux Mint Cinnamon";;
|
||||||
|
linuxmint-mate) DISPLAY_NAME="Linux Mint MATE";;
|
||||||
|
linuxmint-xfce) DISPLAY_NAME="Linux Mint XFCE";;
|
||||||
macos) DISPLAY_NAME="macOS";;
|
macos) DISPLAY_NAME="macOS";;
|
||||||
opensuse) DISPLAY_NAME="OpenSUSE";;
|
opensuse) DISPLAY_NAME="OpenSUSE";;
|
||||||
popos) DISPLAY_NAME="Pop!_OS";;
|
popos) DISPLAY_NAME="Pop!_OS";;
|
||||||
|
@ -44,7 +49,9 @@ function os_support() {
|
||||||
freebsd \
|
freebsd \
|
||||||
fedora \
|
fedora \
|
||||||
kubuntu \
|
kubuntu \
|
||||||
linuxmint \
|
linuxmint-cinnamon \
|
||||||
|
linuxmint-mate \
|
||||||
|
linuxmint-xfce \
|
||||||
lubuntu \
|
lubuntu \
|
||||||
macos \
|
macos \
|
||||||
opensuse \
|
opensuse \
|
||||||
|
@ -74,7 +81,7 @@ function releases_fedora(){
|
||||||
}
|
}
|
||||||
|
|
||||||
function releases_linuxmint(){
|
function releases_linuxmint(){
|
||||||
echo cinnamon-20_2 \
|
echo 20.2
|
||||||
mate-20_2 \
|
mate-20_2 \
|
||||||
xfce-20-2
|
xfce-20-2
|
||||||
}
|
}
|
||||||
|
@ -410,7 +417,7 @@ function make_vm_config() {
|
||||||
elif [[ "${OS}" == "fedora" ]]; then
|
elif [[ "${OS}" == "fedora" ]]; then
|
||||||
GUEST="linux"
|
GUEST="linux"
|
||||||
IMAGE_TYPE="iso"
|
IMAGE_TYPE="iso"
|
||||||
elif [[ "${OS}" == "linuxmint" ]]; then
|
elif [[ "${OS}" == *"linuxmint"* ]]; then
|
||||||
GUEST="linux"
|
GUEST="linux"
|
||||||
IMAGE_TYPE="iso"
|
IMAGE_TYPE="iso"
|
||||||
elif [[ "${OS}" == "opensuse" ]]; then
|
elif [[ "${OS}" == "opensuse" ]]; then
|
||||||
|
@ -546,26 +553,21 @@ function get_fedora() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_linuxmint() {
|
function get_linuxmint() {
|
||||||
|
local FLAVOR=""
|
||||||
|
local ISO=""
|
||||||
|
local RELEASES=""
|
||||||
local URL=""
|
local URL=""
|
||||||
local DL_BASE="https://mirrors.edge.kernel.org/linuxmint/stable"
|
|
||||||
local VERSION=""
|
|
||||||
|
|
||||||
case ${RELEASE} in
|
RELEASES=$(releases_linuxmint)
|
||||||
cinnamon-20_2|mate-20_2|xfce-20_2) VERSION=${RELEASE//_/.};;
|
if [[ "${RELEASES}" != *"${RELEASE}"* ]]; then
|
||||||
*)
|
echo "ERROR! Linux Mint ${RELEASE} is not a supported release."
|
||||||
echo "ERROR! linuxmint ${RELEASE} is not a supported release."
|
echo "${RELEASES}"
|
||||||
releases_linuxmint
|
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
fi
|
||||||
esac
|
|
||||||
|
|
||||||
re='(.*)-(.*)'
|
FLAVOR=$(echo "${OS}" | cut -d'-' -f2)
|
||||||
[[ ${VERSION} =~ ${re} ]];
|
ISO="linuxmint-${RELEASE}-${FLAVOR}-64bit.iso"
|
||||||
local FLAVOR=${BASH_REMATCH[1]}
|
URL="https://mirrors.edge.kernel.org/linuxmint/stable/${RELEASE}/${ISO}"
|
||||||
VERSION=${BASH_REMATCH[2]}
|
|
||||||
|
|
||||||
ISO="linuxmint-${VERSION}-${FLAVOR}-64bit.iso"
|
|
||||||
URL="${DL_BASE}/${VERSION}/${ISO}"
|
|
||||||
|
|
||||||
make_vm_dir
|
make_vm_dir
|
||||||
web_get "${URL}" "${VM_PATH}"
|
web_get "${URL}" "${VM_PATH}"
|
||||||
|
|
Loading…
Reference in a new issue