From f8fe496df244321977d5a7588feb04a549d046b6 Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Sun, 21 Nov 2021 23:54:34 +0400 Subject: [PATCH 1/3] Add CachyOS support --- README.md | 3 ++- quickget | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 976b516..1676e27 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ comprehensive support for macOS and Windows**. * [Ubuntu](https://ubuntu.com/desktop) and all the **[official Ubuntu flavours](https://ubuntu.com/download/flavours)** * [Fedora](https://getfedora.org/) & openSUSE ([Leap](https://get.opensuse.org/leap/), [Tumbleweed](https://get.opensuse.org/tumbleweed/), [MicroOS](https://microos.opensuse.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/), [Kali](https://www.kali.org/), [Garuda](https://garudalinux.org/), [CachyOS](https://cachyos.org/), [ZorinOS](https://zorin.com/os/) & [NixOS](https://nixos.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/) * Full SPICE support including host/guest clipboard sharing @@ -177,6 +177,7 @@ preferred flavour. * `elementary` * `fedora` * `garuda` + * `cachyos` * `kali` * `linuxmint-cinnamon` * `linuxmint-mate` diff --git a/quickget b/quickget index 84be965..b1a1d40 100755 --- a/quickget +++ b/quickget @@ -39,6 +39,7 @@ function pretty_name() { elementary) PRETTY_NAME="elementary OS";; freebsd) PRETTY_NAME="FreeBSD";; garuda) PRETTY_NAME="Garuda Linux";; + cachyos) PRETTY_NAME="CachyOS";; kdeneon) PRETTY_NAME="KDE Neon";; linuxmint-cinnamon) PRETTY_NAME="Linux Mint Cinnamon";; linuxmint-mate) PRETTY_NAME="Linux Mint MATE";; @@ -126,6 +127,8 @@ function list_csv() { DOWNLOADER="${DL}" elif [ "${OS}" == "garuda" ]; then DOWNLOADER="${DL}" + elif [ "${OS}" == "cachyos" ]; then + DOWNLOADER="${DL}" elif [[ "${OS}" == *"kdeneon"* ]]; then DOWNLOADER="${DL}" else @@ -155,6 +158,7 @@ function os_support() { freebsd \ fedora \ garuda \ + cachyos \ kali \ kdeneon \ kubuntu \ @@ -229,6 +233,10 @@ function releases_garuda() { cinnamon } +function releases_cachyos() { + echo 2021.11.10 +} + function releases_kali() { echo latest \ weekly @@ -680,6 +688,9 @@ function make_vm_config() { elif [ "${OS}" == "garuda" ]; then GUEST="linux" IMAGE_TYPE="iso" + elif [ "${OS}" == "cachyos" ]; then + GUEST="linux" + IMAGE_TYPE="iso" elif [ "${OS}" == "kdeneon" ]; then GUEST="linux" IMAGE_TYPE="iso" @@ -740,6 +751,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 @@ -810,6 +825,19 @@ function get_archlinux() { 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" + URL="https://deac-fra.dl.sourceforge.net/project/cachyos-arch/cli-installer" + web_get "${URL}/${ISO}" "${VM_PATH}" + make_vm_config "${ISO}" +} + function get_elementary() { local ISO="" local URL="" @@ -1349,6 +1377,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 @@ -1434,6 +1464,8 @@ else releases_fedora elif [ "${OS}" == "garuda" ]; then releases_garuda + elif [ "${OS}" == "cachyos" ]; then + releases_cachyos elif [ "${OS}" == "kali" ]; then releases_kali elif [[ "${OS}" == *"linuxmint-"* ]]; then From c0ea6963ac4e6a90e3a63bfa795e6ba483dff274 Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Tue, 23 Nov 2021 00:32:38 +0400 Subject: [PATCH 2/3] sort the changes --- quickget | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/quickget b/quickget index b1a1d40..a917dbd 100755 --- a/quickget +++ b/quickget @@ -36,10 +36,10 @@ function pretty_name() { case ${SIMPLE_NAME} in android) PRETTY_NAME="Android x86";; archlinux) PRETTY_NAME="Arch Linux";; + cachyos) PRETTY_NAME="CachyOS";; elementary) PRETTY_NAME="elementary OS";; freebsd) PRETTY_NAME="FreeBSD";; garuda) PRETTY_NAME="Garuda Linux";; - cachyos) PRETTY_NAME="CachyOS";; kdeneon) PRETTY_NAME="KDE Neon";; linuxmint-cinnamon) PRETTY_NAME="Linux Mint Cinnamon";; linuxmint-mate) PRETTY_NAME="Linux Mint MATE";; @@ -125,10 +125,10 @@ function list_csv() { DOWNLOADER="${DL}" elif [[ "${OS}" == *"ubuntu"* ]] && [ "${RELEASE}" == "devel" ]; then DOWNLOADER="${DL}" - elif [ "${OS}" == "garuda" ]; then - DOWNLOADER="${DL}" elif [ "${OS}" == "cachyos" ]; then DOWNLOADER="${DL}" + elif [ "${OS}" == "garuda" ]; then + DOWNLOADER="${DL}" elif [[ "${OS}" == *"kdeneon"* ]]; then DOWNLOADER="${DL}" else @@ -154,11 +154,11 @@ function list_csv() { function os_support() { echo android \ archlinux \ + cachyos \ elementary \ freebsd \ fedora \ garuda \ - cachyos \ kali \ kdeneon \ kubuntu \ @@ -201,6 +201,10 @@ function releases_archlinux() { echo latest } +function releases_cachyos() { + echo 2021.11.10 +} + function releases_elementary() { echo 6.0 } @@ -233,10 +237,6 @@ function releases_garuda() { cinnamon } -function releases_cachyos() { - echo 2021.11.10 -} - function releases_kali() { echo latest \ weekly @@ -673,6 +673,9 @@ function make_vm_config() { elif [ "${OS}" == "archlinux" ]; then GUEST="linux" IMAGE_TYPE="iso" + elif [ "${OS}" == "cachyos" ]; then + GUEST="linux" + IMAGE_TYPE="iso" elif [ "${OS}" == "elementary" ]; then GUEST="linux" IMAGE_TYPE="iso" @@ -688,9 +691,6 @@ function make_vm_config() { elif [ "${OS}" == "garuda" ]; then GUEST="linux" IMAGE_TYPE="iso" - elif [ "${OS}" == "cachyos" ]; then - GUEST="linux" - IMAGE_TYPE="iso" elif [ "${OS}" == "kdeneon" ]; then GUEST="linux" IMAGE_TYPE="iso" From b46c8e4f54c1ef1e3eb4d0744752f1d427c9a8e3 Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Wed, 24 Nov 2021 00:17:37 +0400 Subject: [PATCH 3/3] use url from mirror --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index a917dbd..5818de7 100755 --- a/quickget +++ b/quickget @@ -833,7 +833,7 @@ function get_cachyos() { validate_release "releases_cachyos" ISO="cachyos-cli-${RELEASE}-x86_64.iso" - URL="https://deac-fra.dl.sourceforge.net/project/cachyos-arch/cli-installer" + URL="https://mirror.cachyos.org/ISO" web_get "${URL}/${ISO}" "${VM_PATH}" make_vm_config "${ISO}" }