Merge remote-tracking branch 'guyosi/master' into merging-updated-distros

This commit is contained in:
Phil 2022-01-17 03:51:59 +00:00
commit 641f6f8a7f
2 changed files with 39 additions and 2 deletions

View File

@ -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/), [CachyOS](https://cachyos.org/), [Kali](https://www.kali.org/),[Garuda](https://garudalinux.org/),[Manjaro](https://manjaro.org), [NixOS](https://nixos.org/) & [ZorinOS](https://zorin.com/os/)
* [Arch Linux](https://www.archlinux.org/),[ArcoLinux](https://www.arcolinux.info/), [CachyOS](https://cachyos.org/), [Kali](https://www.kali.org/),[Garuda](https://garudalinux.org/), [Gentoo Linux](https://www.gentoo.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/)
@ -181,11 +181,12 @@ preferred flavour.
* `alpine`
* `archlinux`
* `arcolinux`
* `cachyos`
* `debian`
* `elementary`
* `fedora`
* `garuda`
* `cachyos`
* `gentoo`
* `kali`
* `kdeneon`
* `linuxmint`

View File

@ -43,6 +43,7 @@ function pretty_name() {
cachyos) PRETTY_NAME="CachyOS";;
elementary) PRETTY_NAME="elementary OS";;
freebsd) PRETTY_NAME="FreeBSD";;
gentoo) PRETTY_NAME="Gentoo";;
garuda) PRETTY_NAME="Garuda Linux";;
kdeneon) PRETTY_NAME="KDE Neon";;
kolibrios) PRETTY_NAME="KolibriOS";;
@ -148,6 +149,8 @@ function list_csv() {
DOWNLOADER="${DL}"
elif [ "${OS}" == "garuda" ]; then
DOWNLOADER="${DL}"
elif [ "${OS}" == "gentoo" ]; then
DOWNLOADER="${DL}"
elif [[ "${OS}" == *"kdeneon"* ]]; then
DOWNLOADER="${DL}"
else
@ -190,6 +193,7 @@ function os_support() {
freebsd \
fedora \
garuda \
gentoo \
kali \
kdeneon \
kolibrios \
@ -295,6 +299,10 @@ function releases_fedora(){
35
}
function releases_gentoo(){
echo latest
}
function releases_garuda() {
echo bspwm \
dr460nized \
@ -619,6 +627,9 @@ function make_vm_config() {
elif [ "${OS}" == "garuda" ]; then
GUEST="linux"
IMAGE_TYPE="iso"
elif [ "${OS}" == "gentoo" ]; then
GUEST="linux"
IMAGE_TYPE="iso"
elif [ "${OS}" == "kdeneon" ]; then
GUEST="linux"
IMAGE_TYPE="iso"
@ -955,6 +966,27 @@ function get_fedora() {
make_vm_config "${ISO}"
}
function get_gentoo() {
local HASH=""
local ISO=""
local URL=""
local LOCAT=""
local INSTALLMIN=""
validate_release "releases_gentoo"
eval $( wget -O/tmp/gentoolatest https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/${RELEASE}-iso.txt 2>&1 |grep Location | awk '{print "LOCAT="$2}' )
LOCAT=$(dirname ${LOCAT})
eval $( awk '/admincd-amd64/ {print "ADMIN="$1}; /install-amd64-minimal/ {print "INSTALLMIN="$1}' /tmp/gentoolatest )
URL="${LOCAT}/${INSTALLMIN}"
ISO=$(basename "${INSTALLMIN}" )
web_get "${URL}" "${VM_PATH}"
HASH=$(wget -q -O- ${LOCAT}/${INSTALLMIN}.DIGESTS|grep -e iso|grep -v -e CONT -e catalyst|cut -d\ -f1)
check_hash "${ISO}" "${HASH}"
make_vm_config "${ISO}"
}
function get_kali() {
local HASH=""
local ISO=""
@ -1918,6 +1950,8 @@ if [ -n "${2}" ]; then
get_garuda
elif [ "${OS}" == "cachyos" ]; then
get_cachyos
elif [ "${OS}" == "gentoo" ]; then
get_gentoo
elif [ "${OS}" == "kali" ]; then
get_kali
elif [ "${OS}" == "kdeneon" ]; then
@ -2023,6 +2057,8 @@ else
releases_garuda
elif [ "${OS}" == "cachyos" ]; then
releases_cachyos
elif [ "${OS}" == "gentoo" ]; then
releases_gentoo
elif [ "${OS}" == "kali" ]; then
releases_kali
elif [ "${OS}" == "kolibrios" ]; then