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

Merge remote-tracking branch 'nvepogodin/master'

Browse source 
into merging-updated-distros

Also updated release and ISO name
as that had changed with an updated release
This commit is contained in:
Phil 2022-01-17 03:42:51 +00:00
commit a8f9a8d703
2 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
README.md
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/), [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/),[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/)
@ -185,6 +185,7 @@ preferred flavour.
* `elementary`
* `fedora`
* `garuda`
* `cachyos`
* `kali`
* `kdeneon`
* `linuxmint`

33
quickget
View file

@ -40,6 +40,7 @@ function pretty_name() {
android) PRETTY_NAME="Android x86";;
archlinux) PRETTY_NAME="Arch Linux";;
arcolinux) PRETTY_NAME="Arco Linux";;
cachyos) PRETTY_NAME="CachyOS";;
elementary) PRETTY_NAME="elementary OS";;
freebsd) PRETTY_NAME="FreeBSD";;
garuda) PRETTY_NAME="Garuda Linux";;
@ -143,6 +144,8 @@ function list_csv() {
DOWNLOADER="${DL}"
elif [[ "${OS}" == *"ubuntu"* ]] && [ "${RELEASE}" == "devel" ]; then
DOWNLOADER="${DL}"
elif [ "${OS}" == "cachyos" ]; then
DOWNLOADER="${DL}"
elif [ "${OS}" == "garuda" ]; then
DOWNLOADER="${DL}"
elif [[ "${OS}" == *"kdeneon"* ]]; then
@ -181,6 +184,7 @@ function os_support() {
android \
archlinux \
arcolinux \
cachyos \
debian \
elementary \
freebsd \
@ -272,6 +276,9 @@ function releases_debian() {
11.2.0-amd64-standard \
11.2.0-amd64-xfce
}
function releases_cachyos() {
echo 2022.01.09
}
function releases_elementary() {
echo 6.1
@ -594,6 +601,9 @@ function make_vm_config() {
elif [ "${OS}" == "debian" ]; then
GUEST="linux"
IMAGE_TYPE="iso"
elif [ "${OS}" == "cachyos" ]; then
GUEST="linux"
IMAGE_TYPE="iso"
elif [ "${OS}" == "elementary" ]; then
GUEST="linux"
IMAGE_TYPE="iso"
@ -701,6 +711,10 @@ EOF
echo "macos_release=\"${RELEASE}\"" >> "${OS}-${RELEASE}.conf"
fi
if [ "${OS}" == "cachyos" ]; then
echo "disk_size=\"32G\"" >> "${OS}-${RELEASE}.conf"
fi
if [ "${OS}" == "garuda" ]; then
echo "disk_size=\"32G\"" >> "${OS}-${RELEASE}.conf"
fi
@ -842,6 +856,21 @@ function get_arcolinux() {
make_vm_config "${ISO}"
}
function get_cachyos() {
local HASH=""
local ISO=""
local URL=""
local VERSION=""
validate_release "releases_cachyos"
#ISO="cachyos-cli-${RELEASE}-x86_64.iso"
ISO="cachyos-${RELEASE}-x86_64.iso"
URL="https://mirror.cachyos.org/ISO"
web_get "${URL}/${ISO}" "${VM_PATH}"
make_vm_config "${ISO}"
}
function get_debian() {
local HASH=""
local ISO=""
@ -1887,6 +1916,8 @@ if [ -n "${2}" ]; then
get_fedora
elif [ "${OS}" == "garuda" ]; then
get_garuda
elif [ "${OS}" == "cachyos" ]; then
get_cachyos
elif [ "${OS}" == "kali" ]; then
get_kali
elif [ "${OS}" == "kdeneon" ]; then
@ -1990,6 +2021,8 @@ else
releases_fedora
elif [ "${OS}" == "garuda" ]; then
releases_garuda
elif [ "${OS}" == "cachyos" ]; then
releases_cachyos
elif [ "${OS}" == "kali" ]; then
releases_kali
elif [ "${OS}" == "kolibrios" ]; then