mirror of
https://github.com/oSoWoSo/DistroHopper.git
synced 2024-08-14 22:46:53 +00:00
Merge remote-tracking branch 'jai-JAP/patch-1' into merging-updated-distros
This commit is contained in:
Phil
commit
f232fdfb4e
2 changed files with 75 additions and 3 deletions
|
|
@ -36,7 +36,7 @@ comprehensive support for macOS and Windows**.
|
|||
* [Alma Linux](https://almalinux.org/)
|
||||
* [Alpine Linux](https://www.alpinelinux.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/),[ArcoLinux](https://www.arcolinux.info/), [Kali](https://www.kali.org/),[Garuda](https://garudalinux.org/), [ZorinOS](https://zorin.com/os/) & [NixOS](https://nixos.org/)
|
||||
* [Arch Linux](https://www.archlinux.org/),[ArcoLinux](https://www.arcolinux.info/), [Kali](https://www.kali.org/),[Garuda](https://garudalinux.org/),[Manjaro](https://manjaro.org), [NixOS](https://nixos.org/) & [ZorinOS](https://zorin.com/os/)
|
||||
* [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/)
|
||||
|
|
@ -180,7 +180,7 @@ preferred flavour.
|
|||
* `alma`
|
||||
* `alpine`
|
||||
* `archlinux`
|
||||
* `arcolinux`
|
||||
* `arcolinux`
|
||||
* `debian`
|
||||
* `elementary`
|
||||
* `fedora`
|
||||
|
|
|
|||
74
quickget
74
quickget
|
|
@ -48,6 +48,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";;
|
||||
|
|
@ -114,6 +122,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
|
||||
|
|
@ -180,6 +190,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 \
|
||||
|
|
@ -336,6 +354,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 \
|
||||
|
|
@ -575,6 +603,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"
|
||||
|
|
@ -935,6 +966,43 @@ function get_linuxmint() {
|
|||
check_hash "${ISO}" "${HASH}"
|
||||
make_vm_config "${ISO}"
|
||||
}
|
||||
|
||||
function get_manjaro() {
|
||||
local FLAVOR=""
|
||||
local MANIFESTURL=""
|
||||
local ISOKEY=""
|
||||
local HASHKEY=""
|
||||
local HASH=""
|
||||
local ISO=""
|
||||
local URL=""
|
||||
|
||||
validate_release "releases_manjaro"
|
||||
FLAVOR=$(echo "${OS}" | cut -d'-' -f2)
|
||||
case ${FLAVOR} in
|
||||
xfce|kde|gnome) BRANCH="official";;
|
||||
budgie|cinnamon|deepin|i3|mate) BRANCH="community";;
|
||||
esac
|
||||
|
||||
if [[ ${RELEASE} == "full" ]]; then
|
||||
KEY="Download_x64 = "
|
||||
HASHKEY="Download_x64_Checksum = "
|
||||
elif [[ ${RELEASE} == "minimal" ]]; then
|
||||
KEY="Download_Minimal_x64 = "
|
||||
HASHKEY="Download_Minimal_x64_Checksum = "
|
||||
elif [[ ${RELEASE} == "minimal" ]]; then
|
||||
KEY="Download_Minimal_lts = "
|
||||
HASHKEY="Download_Minimal_x64_Checksum_lts = "
|
||||
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}' | 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}"
|
||||
make_vm_config "${ISO}"
|
||||
}
|
||||
|
||||
function get_nixos() {
|
||||
local FLAVOR=""
|
||||
local HASH=""
|
||||
|
|
@ -1757,6 +1825,8 @@ if [ -n "${2}" ]; then
|
|||
get_kolibrios
|
||||
elif [[ "${OS}" == *"linuxmint-"* ]]; then
|
||||
get_linuxmint
|
||||
elif [[ "${OS}" == *"manjaro-"* ]]; then
|
||||
get_manjaro
|
||||
elif [[ "${OS}" == *"nixos-"* ]]; then
|
||||
get_nixos
|
||||
elif [ "${OS}" == "openbsd" ]; then
|
||||
|
|
@ -1765,7 +1835,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)
|
||||
|
|
@ -1852,6 +1922,8 @@ else
|
|||
releases_kolibrios
|
||||
elif [[ "${OS}" == *"linuxmint-"* ]]; then
|
||||
releases_linuxmint
|
||||
elif [[ "${OS}" == *"manjaro-"* ]]; then
|
||||
releases_manjaro
|
||||
elif [[ "${OS}" == *"nixos-"* ]]; then
|
||||
releases_nixos
|
||||
elif [ "${OS}" == "opensuse" ]; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue