Merge remote-tracking branch 'erikdubois/master' into merging-updated-distros
This commit is contained in:
commit
dc901fa932
@ -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/),[ArcoLinux](https://www.arcolinux.info/), [Kali](https://www.kali.org/),[Garuda](https://garudalinux.org/), [ZorinOS](https://zorin.com/os/) & [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/)
|
||||
@ -178,6 +178,7 @@ preferred flavour.
|
||||
|
||||
* `alma`
|
||||
* `archlinux`
|
||||
* `arcolinux`
|
||||
* `debian`
|
||||
* `elementary`
|
||||
* `fedora`
|
||||
|
28
quickget
28
quickget
@ -38,6 +38,7 @@ function pretty_name() {
|
||||
alma) PRETTY_NAME="Alma Linux";;
|
||||
android) PRETTY_NAME="Android x86";;
|
||||
archlinux) PRETTY_NAME="Arch Linux";;
|
||||
arcolinux) PRETTY_NAME="Arco Linux";;
|
||||
elementary) PRETTY_NAME="elementary OS";;
|
||||
freebsd) PRETTY_NAME="FreeBSD";;
|
||||
garuda) PRETTY_NAME="Garuda Linux";;
|
||||
@ -163,6 +164,7 @@ function os_support() {
|
||||
echo alma \
|
||||
android \
|
||||
archlinux \
|
||||
arcolinux \
|
||||
debian \
|
||||
elementary \
|
||||
freebsd \
|
||||
@ -217,6 +219,10 @@ function releases_archlinux() {
|
||||
echo latest
|
||||
}
|
||||
|
||||
function releases_arcolinux() {
|
||||
echo latest
|
||||
}
|
||||
|
||||
# later refactor these DE variants like languages and avoid the arch ?
|
||||
# all these are available with a "nonfree" option too
|
||||
function releases_debian() {
|
||||
@ -520,6 +526,9 @@ function make_vm_config() {
|
||||
elif [ "${OS}" == "archlinux" ]; then
|
||||
GUEST="linux"
|
||||
IMAGE_TYPE="iso"
|
||||
elif [ "${OS}" == "arcolinux" ]; then
|
||||
GUEST="linux"
|
||||
IMAGE_TYPE="iso"
|
||||
elif [ "${OS}" == "debian" ]; then
|
||||
GUEST="linux"
|
||||
IMAGE_TYPE="iso"
|
||||
@ -709,6 +718,21 @@ function get_archlinux() {
|
||||
make_vm_config "${ISO}"
|
||||
}
|
||||
|
||||
function get_arcolinux() {
|
||||
local HASH=""
|
||||
local ISO=""
|
||||
local URL=""
|
||||
local VERSION=""
|
||||
|
||||
validate_release "releases_arcolinux"
|
||||
VERSION=$(wget -q -O- 'https://ant.seedhost.eu/arcolinux/.quick/info' | cut -d " " -f 2)
|
||||
URL="https://ant.seedhost.eu/arcolinux/.quick/"
|
||||
ISO="arcolinuxl-${VERSION}-x86_64.iso"
|
||||
HASH=$(wget -q -O- 'https://ant.seedhost.eu/arcolinux/.quick/arcolinuxl-'${VERSION}'-x86_64.iso.sha1' | cut -d " " -f 1)
|
||||
web_get "${URL}/${ISO}" "${VM_PATH}"
|
||||
check_hash "${ISO}" "${HASH}"
|
||||
make_vm_config "${ISO}"
|
||||
}
|
||||
|
||||
function get_debian() {
|
||||
local HASH=""
|
||||
@ -1628,6 +1652,8 @@ if [ -n "${2}" ]; then
|
||||
get_android
|
||||
elif [ "${OS}" == "archlinux" ]; then
|
||||
get_archlinux
|
||||
elif [ "${OS}" == "arcolinux" ]; then
|
||||
get_arcolinux
|
||||
elif [ "${OS}" == "debian" ]; then
|
||||
if [ -n "${3}" ]; then
|
||||
FREEDOM="${3}"
|
||||
@ -1735,6 +1761,8 @@ else
|
||||
releases_android
|
||||
elif [ "${OS}" == "archlinux" ]; then
|
||||
releases_archlinux
|
||||
elif [ "${OS}" == "arcolinux" ]; then
|
||||
releases_arcolinux
|
||||
elif [ "${OS}" == "debian" ]; then
|
||||
releases_debian
|
||||
elif [ "${OS}" == "elementary" ]; then
|
||||
|
Loading…
Reference in New Issue
Block a user