From f8fe496df244321977d5a7588feb04a549d046b6 Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Sun, 21 Nov 2021 23:54:34 +0400 Subject: [PATCH 01/47] 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 02/47] 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 03/47] 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}" } From 726d32a025b517fb0dc82f4d32ba17127e6d6684 Mon Sep 17 00:00:00 2001 From: guyosi Date: Sun, 28 Nov 2021 18:06:23 -0500 Subject: [PATCH 04/47] Adding gentoo support This code is for adding gentoo support, its not complete yet --- quickget | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/quickget b/quickget index 5415d96..a5008aa 100755 --- a/quickget +++ b/quickget @@ -38,6 +38,7 @@ function pretty_name() { archlinux) PRETTY_NAME="Arch Linux";; elementary) PRETTY_NAME="elementary OS";; freebsd) PRETTY_NAME="FreeBSD";; + gentoo) PRETTY_NAME="Gentoo";; garuda) PRETTY_NAME="Garuda Linux";; kdeneon) PRETTY_NAME="KDE Neon";; linuxmint-cinnamon) PRETTY_NAME="Linux Mint Cinnamon";; @@ -155,6 +156,7 @@ function os_support() { freebsd \ fedora \ garuda \ + gentoo \ kali \ kdeneon \ kubuntu \ @@ -212,6 +214,10 @@ function releases_fedora(){ 35 } +function releases_gentoo(){ + echo latest +} + function releases_garuda() { echo bspwm \ dr460nized \ @@ -679,6 +685,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" @@ -865,6 +874,21 @@ function get_fedora() { make_vm_config "${ISO}" } +function get_gentoo() { + local HASH="" + local ISO="" + local URL="" + + validate_release "releases_gentoo" + ISO="gentoo-${RELEASE}-amd64.iso" + URL="https://www.gentoo.org/download/${ISO}" + web_get "${URL}" "${VM_PATH}" + web_get "${URL}/SHA256SUMS" "${VM_PATH}" + HASH=$(cat "${VM_PATH}/SHA256SUMS" | cut -d' ' -f1) + check_hash "${ISO}" "${HASH}" + make_vm_config "${ISO}" +} + function get_kali() { local HASH="" local ISO="" @@ -1344,6 +1368,8 @@ if [ -n "${2}" ]; then get_fedora elif [ "${OS}" == "garuda" ]; then get_garuda + elif [ "${OS}" == "gentoo" ]; then + get_gentoo elif [ "${OS}" == "kali" ]; then get_kali elif [ "${OS}" == "kdeneon" ]; then @@ -1429,6 +1455,8 @@ else releases_fedora elif [ "${OS}" == "garuda" ]; then releases_garuda + elif [ "${OS}" == "gentoo" ]; then + releases_gentoo elif [ "${OS}" == "kali" ]; then releases_kali elif [[ "${OS}" == *"linuxmint-"* ]]; then From ae6f2f9d17e7ce69d729bada490b8044837be024 Mon Sep 17 00:00:00 2001 From: Phil Date: Mon, 29 Nov 2021 04:00:55 +0000 Subject: [PATCH 05/47] Attempt to get gentoo Some tweaks towards getting the latest release iso --- quickget | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/quickget b/quickget index ed6fe7c..d7d1497 100755 --- a/quickget +++ b/quickget @@ -127,6 +127,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 @@ -876,18 +878,24 @@ function get_fedora() { } function get_gentoo() { - local HASH="" - local ISO="" - local URL="" - - validate_release "releases_gentoo" - ISO="gentoo-${RELEASE}-amd64.iso" - URL="https://www.gentoo.org/download/${ISO}" - web_get "${URL}" "${VM_PATH}" - web_get "${URL}/SHA256SUMS" "${VM_PATH}" - HASH=$(cat "${VM_PATH}/SHA256SUMS" | cut -d' ' -f1) - check_hash "${ISO}" "${HASH}" - make_vm_config "${ISO}" + 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() { From e8434516a611bcf22a63dea764ca439dc5b56a08 Mon Sep 17 00:00:00 2001 From: guyosi Date: Mon, 29 Nov 2021 07:50:24 -0500 Subject: [PATCH 06/47] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 976b516..6dc4751 100644 --- a/README.md +++ b/README.md @@ -177,6 +177,7 @@ preferred flavour. * `elementary` * `fedora` * `garuda` + * 'gentoo' * `kali` * `linuxmint-cinnamon` * `linuxmint-mate` From 8a47ad721e8fec285f65d1030f3291bbe8ae6fbf Mon Sep 17 00:00:00 2001 From: guyosi Date: Mon, 29 Nov 2021 07:54:59 -0500 Subject: [PATCH 07/47] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6dc4751..a973d9d 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/), [ZorinOS](https://zorin.com/os/), [NixOS](https://nixos.org/) & [Gentoo Linux](https://www.gentoo.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,7 +177,7 @@ preferred flavour. * `elementary` * `fedora` * `garuda` - * 'gentoo' + * `gentoo` * `kali` * `linuxmint-cinnamon` * `linuxmint-mate` From 3cdfe211b4e69d5b4d30f760953000af5c6dfcf5 Mon Sep 17 00:00:00 2001 From: Jordan Day Date: Mon, 13 Dec 2021 10:31:37 -0600 Subject: [PATCH 08/47] Set URL to 'Current' ISO for Leap >= 15.2 --- quickget | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/quickget b/quickget index 84be965..6145e98 100755 --- a/quickget +++ b/quickget @@ -1014,10 +1014,14 @@ function get_opensuse() { ISO="openSUSE-MicroOS-DVD-x86_64-Current.iso" URL="https://download.opensuse.org/tumbleweed/iso/${ISO}" HASH=$(wget -q -O- "${URL}.sha256" | cut -d' ' -f1) - else + elif [ "$RELEASE" == 15.0 ] || [ "$RELEASE" == 15.1 ]; then ISO="openSUSE-Leap-${RELEASE}-DVD-x86_64.iso" URL="https://download.opensuse.org/distribution/leap/${RELEASE}/iso/${ISO}" HASH=$(wget -q -O- "${URL}.sha256" | cut -d' ' -f1) + else + ISO="openSUSE-Leap-${RELEASE}-DVD-x86_64-Current.iso" + URL="https://download.opensuse.org/distribution/leap/${RELEASE}/iso/${ISO}" + HASH=$(wget -q -O- "${URL}.sha256" | cut -d' ' -f1) fi web_get "${URL}" "${VM_PATH}" check_hash "${ISO}" "${HASH}" From b3f3545a99ea8b129976a57102030a69bb2c95f0 Mon Sep 17 00:00:00 2001 From: Christian Mayer Date: Thu, 16 Dec 2021 13:00:01 +0100 Subject: [PATCH 09/47] Pop!_OS: add 21.10 --- quickget | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/quickget b/quickget index 235fd9a..e08370c 100755 --- a/quickget +++ b/quickget @@ -316,7 +316,8 @@ function releases_macos() { function releases_popos() { echo 20.04 \ - 21.04 + 21.04 \ + 21.10 } function releases_regolith() { From 4a048626ff845a2d2b29a0051ee38e8388fc6ac7 Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Fri, 17 Dec 2021 01:44:38 +0000 Subject: [PATCH 10/47] New release of elementaryOS 6.0 --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index 235fd9a..c6067c0 100755 --- a/quickget +++ b/quickget @@ -745,7 +745,7 @@ function get_elementary() { validate_release "releases_elementary" B66tim=$(date +%s | base64 ) - ISO="elementaryos-${RELEASE}-stable.20211005.iso" + ISO="elementaryos-${RELEASE}-stable.20211130.iso" # TODO: derive region from geoIP URL="https://ams3.dl.elementary.io/download/${B66tim}=/${ISO}" web_get "${URL}" "${VM_PATH}" From c1ded4df4dcc2847140b19c92ce7be2bab23572c Mon Sep 17 00:00:00 2001 From: arcolinuxz Date: Mon, 20 Dec 2021 11:35:54 +0100 Subject: [PATCH 11/47] add arcolinux --- quickget | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/quickget b/quickget index 235fd9a..35b744c 100755 --- a/quickget +++ b/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() { @@ -519,6 +525,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" @@ -708,6 +717,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="" @@ -1627,6 +1651,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}" @@ -1734,6 +1760,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 From cc7caab80efad0e8cbc11e8e46f88da60597e225 Mon Sep 17 00:00:00 2001 From: arcolinuxz Date: Mon, 20 Dec 2021 13:18:50 +0100 Subject: [PATCH 12/47] readme added --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 78ac412..8a57a11 100644 --- a/README.md +++ b/README.md @@ -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/),[Arco Linux](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/) From a487d9a95270b5225fbd0f41d21d32a39a098c8c Mon Sep 17 00:00:00 2001 From: arcolinuxz Date: Mon, 20 Dec 2021 13:20:21 +0100 Subject: [PATCH 13/47] readme added --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a57a11..f9c7552 100644 --- a/README.md +++ b/README.md @@ -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/),[Arco Linux](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/), [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/) From a5f9b282c95ab9631fe437c432cbb3bdb4ff4840 Mon Sep 17 00:00:00 2001 From: arcolinuxz Date: Mon, 20 Dec 2021 13:33:44 +0100 Subject: [PATCH 14/47] readme added --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f9c7552..6d5813f 100644 --- a/README.md +++ b/README.md @@ -178,6 +178,7 @@ preferred flavour. * `alma` * `archlinux` + * `arcolinux` * `debian` * `elementary` * `fedora` From 74068d240b0a95e2aac4ecd3de38a36aaf9d99a0 Mon Sep 17 00:00:00 2001 From: guinuxbr Date: Mon, 20 Dec 2021 21:51:38 +0000 Subject: [PATCH 15/47] Added openSUSE path for OVMF --- quickemu | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/quickemu b/quickemu index 5507580..96e2588 100755 --- a/quickemu +++ b/quickemu @@ -395,6 +395,9 @@ function vm_boot() { elif [ -e "/usr/share/edk2-ovmf/OVMF_CODE.fd" ]; then EFI_CODE="/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd" efi_vars "/usr/share/edk2-ovmf/OVMF_VARS.fd" "${EFI_VARS}" + elif [ -e "/usr/share/qemu/ovmf-x86_64-smm-ms-code.bin" ]; then + EFI_CODE="/usr/share/qemu/ovmf-x86_64-smm-ms-code.bin" + efi_vars "/usr/share/qemu/ovmf-x86_64-smm-ms-vars.bin" "${EFI_VARS}" else echo "ERROR! SecureBoot was requested but no SecureBoot capable firmware was found." echo " Please install OVMF firmware." @@ -417,6 +420,9 @@ function vm_boot() { elif [ -e "/usr/share/edk2-ovmf/OVMF_CODE.fd" ]; then EFI_CODE="/usr/share/edk2-ovmf/OVMF_CODE.fd" efi_vars "/usr/share/edk2-ovmf/OVMF_VARS.fd" "${EFI_VARS}" + elif [ -e "/usr/share/qemu/ovmf-x86_64-4m-code.bin" ]; then + EFI_CODE="/usr/share/qemu/ovmf-x86_64-4m-code.bin" + efi_vars "/usr/share/qemu/ovmf-x86_64-4m-vars.bin" "${EFI_VARS}" else echo "ERROR! EFI boot requested but no EFI firmware found." echo " Please install OVMF firmware." From 310d2d3aa1028775fa50e13a0cfce1a32f810b93 Mon Sep 17 00:00:00 2001 From: Vitaliy Krylov Date: Wed, 22 Dec 2021 00:13:47 +0300 Subject: [PATCH 16/47] Adding KolibriOS support It can download and boot this OS. There is one requirement: 7z. Its not completed yet (at least internet and sound dont work) --- quickemu | 2 +- quickget | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/quickemu b/quickemu index 5507580..78a3c74 100755 --- a/quickemu +++ b/quickemu @@ -451,7 +451,7 @@ function vm_boot() { # Make any OS specific adjustments case ${guest_os} in - freebsd|linux|openbsd) + freebsd|kolibrios|linux|openbsd) CPU="-cpu host,kvm=on" if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then CPU="${CPU},topoext" diff --git a/quickget b/quickget index 235fd9a..f4fa47e 100755 --- a/quickget +++ b/quickget @@ -42,6 +42,7 @@ function pretty_name() { freebsd) PRETTY_NAME="FreeBSD";; garuda) PRETTY_NAME="Garuda Linux";; kdeneon) PRETTY_NAME="KDE Neon";; + kolibrios) PRETTY_NAME="KolibriOS";; linuxmint-cinnamon) PRETTY_NAME="Linux Mint Cinnamon";; linuxmint-mate) PRETTY_NAME="Linux Mint MATE";; linuxmint-xfce) PRETTY_NAME="Linux Mint XFCE";; @@ -170,6 +171,7 @@ function os_support() { garuda \ kali \ kdeneon \ + kolibrios \ kubuntu \ linuxmint-cinnamon \ linuxmint-mate \ @@ -274,6 +276,10 @@ function releases_kdeneon() { developer } +function releases_kolibrios() { + echo latest-iso +} + function releases_linuxmint(){ echo 20.2 } @@ -540,6 +546,9 @@ function make_vm_config() { elif [ "${OS}" == "kdeneon" ]; then GUEST="linux" IMAGE_TYPE="iso" + elif [ "${OS}" == "kolibrios" ]; then + GUEST="kolibrios" + IMAGE_TYPE="iso" elif [[ "${OS}" == *"linuxmint"* ]]; then GUEST="linux" IMAGE_TYPE="iso" @@ -596,9 +605,16 @@ EOF if [ -n "${ISO_FILE}" ]; then echo "fixed_iso=\"${VM_PATH}/${ISO_FILE}\"" >> "${OS}-${RELEASE}.conf" fi + if [ "${OS}" == "alma" ] && [ ${ISOTYPE} == "dvd" ]; then echo "disk_size=\"32G\"" >> "${OS}-${RELEASE}.conf" fi + + if [ "${OS}" == "kolibrios" ]; then + echo "boot=\"legacy\"" >> "${OS}-${RELEASE}.conf" + echo "disk_size=\"256M\"" >> "${OS}-${RELEASE}.conf" + fi + if [ "${OS}" == "openbsd" ]; then echo "boot=\"legacy\"" >> "${OS}-${RELEASE}.conf" fi @@ -828,6 +844,21 @@ function get_kdeneon() { make_vm_config "${ISO}" } +function get_kolibrios() { + local HASH="" + local ISO="" + local URL="" + + validate_release "releases_kolibrios" + URL="https://builds.kolibrios.org/eng/${RELEASE}.7z" + web_get "${URL}" "${VM_PATH}" + 7z e "${VM_PATH}/${RELEASE}.7z" "kolibri.iso" + ISO="kolibrios-${RELEASE}.iso" + mv "kolibri.iso" "${VM_PATH}/${ISO}" + rm "${VM_PATH}/${RELEASE}.7z" + make_vm_config "${ISO}" +} + function get_linuxmint() { local FLAVOR="" local HASH="" @@ -1657,6 +1688,8 @@ if [ -n "${2}" ]; then get_kali elif [ "${OS}" == "kdeneon" ]; then get_kdeneon + elif [ "${OS}" == "kolibrios" ]; then + get_kolibrios elif [[ "${OS}" == *"linuxmint-"* ]]; then get_linuxmint elif [[ "${OS}" == *"nixos-"* ]]; then @@ -1746,6 +1779,8 @@ else releases_garuda elif [ "${OS}" == "kali" ]; then releases_kali + elif [ "${OS}" == "kolibrios" ]; then + releases_kolibrios elif [[ "${OS}" == *"linuxmint-"* ]]; then releases_linuxmint elif [[ "${OS}" == *"nixos-"* ]]; then From 82be8d324ccb947a36c82476d6ea79d88f2a2101 Mon Sep 17 00:00:00 2001 From: Vitaliy Krylov Date: Thu, 23 Dec 2021 20:36:34 +0300 Subject: [PATCH 17/47] Improved support of KolibriOS: CD-ROM (iso), Disk, Internet and Audio are working now. Also added forced LiveCD booting (because release named latest-iso, not latest-img). Did some tweaks with '-machine' and '-cpu'. Now these VMs will run with 'qemu32' processor since KolibriOS throw an MTRR error (I didnt get how to fix it by any other way). --- quickemu | 31 ++++++++++++++++++++++++++++--- quickget | 1 - 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/quickemu b/quickemu index 78a3c74..f0a44a3 100755 --- a/quickemu +++ b/quickemu @@ -228,6 +228,7 @@ function vm_boot() { local KERNEL_NODE="" local KERNEL_VER="?" local LSB_DESCRIPTION="Unknown OS" + local MACHINETYPE="q35" local MAC_BOOTLOADER="" local MAC_MISSING="" local MAC_DISK_DEV="ide-hd,bus=ahci.2" @@ -451,7 +452,7 @@ function vm_boot() { # Make any OS specific adjustments case ${guest_os} in - freebsd|kolibrios|linux|openbsd) + freebsd|linux|openbsd) CPU="-cpu host,kvm=on" if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then CPU="${CPU},topoext" @@ -463,6 +464,18 @@ function vm_boot() { disk_size="16G" fi ;; + kolibrios) + CPU="-cpu qemu32,kvm=on" + if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then + CPU="${CPU},topoext" + fi + MACHINETYPE="pc" + NET_DEVICE="rtl8139" + GUEST_TWEAKS="-boot d" + if [ -z "${disk_size}" ]; then + disk_size="256M" + fi + ;; macos) #https://www.nicksherlock.com/2020/06/installing-macos-big-sur-on-proxmox/ # A CPU with SSE4.1 support is required for >= macOS Sierra @@ -591,7 +604,7 @@ function vm_boot() { fi fi - if [ "${DISK_USED}" == "yes" ]; then + if [ "${DISK_USED}" == "yes" ] && [ "${guest_os}" != "kolibrios" ]; then # If there is a disk image that appears to be used do not boot from installation media. iso="" img="" @@ -833,7 +846,7 @@ function vm_boot() { # shellcheck disable=SC2054,SC2206,SC2140 args+=(-name ${VMNAME},process=${VMNAME} -pidfile "${VMDIR}/${VMNAME}.pid" - -enable-kvm -machine q35,smm=${SMM},vmport=off ${GUEST_TWEAKS} + -enable-kvm -machine ${MACHINETYPE},smm=${SMM},vmport=off ${GUEST_TWEAKS} ${CPU} ${SMP} -m ${RAM_VM} ${BALLOON} -smbios type=2,manufacturer="Quickemu Project",product="Quickemu",version="${VERSION}",serial="0xDEADBEEF",location="quickemu.com",asset="${VMNAME}" @@ -891,6 +904,13 @@ function vm_boot() { args+=(-drive if=floppy,format=raw,file="${floppy}") fi + # Since there is bug (probably) in KolibriOS: cdrom indexes 0 or 1 make system show an extra unexisting iso, so we use index=2 + if [ -n "${iso}" ] && [ "${guest_os}" == "kolibrios" ]; then + # shellcheck disable=SC2054 + args+=(-drive media=cdrom,index=2,file="${iso}") + iso="" + fi + if [ -n "${iso}" ]; then # shellcheck disable=SC2054 args+=(-drive media=cdrom,index=0,file="${iso}") @@ -922,6 +942,11 @@ function vm_boot() { # shellcheck disable=SC2054,SC2206 args+=(-device ${MAC_DISK_DEV},drive=SystemDisk -drive id=SystemDisk,if=none,format=qcow2,file="${disk_img}" ${STATUS_QUO}) + elif [ "${guest_os}" == "kolibrios" ]; then + # shellcheck disable=SC2054,SC2206 + args+=(-device ahci,id=ahci + -device ide-hd,bus=ahci.0,drive=SystemDisk + -drive id=SystemDisk,if=none,format=qcow2,file="${disk_img}" ${STATUS_QUO}) else # shellcheck disable=SC2054,SC2206 args+=(-device virtio-blk-pci,drive=SystemDisk diff --git a/quickget b/quickget index f4fa47e..76f2cf3 100755 --- a/quickget +++ b/quickget @@ -612,7 +612,6 @@ EOF if [ "${OS}" == "kolibrios" ]; then echo "boot=\"legacy\"" >> "${OS}-${RELEASE}.conf" - echo "disk_size=\"256M\"" >> "${OS}-${RELEASE}.conf" fi if [ "${OS}" == "openbsd" ]; then From 9f27cbffa268dbefeb17e5b08f3596e8f3a93436 Mon Sep 17 00:00:00 2001 From: nqvrg <66185596+nqvrg@users.noreply.github.com> Date: Sun, 26 Dec 2021 16:05:38 +0100 Subject: [PATCH 18/47] Add Haiku R1 Beta 3 to quickget script --- quickget | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/quickget b/quickget index 235fd9a..577ad0c 100755 --- a/quickget +++ b/quickget @@ -41,6 +41,7 @@ function pretty_name() { elementary) PRETTY_NAME="elementary OS";; freebsd) PRETTY_NAME="FreeBSD";; garuda) PRETTY_NAME="Garuda Linux";; + haiku) PRETTY_NAME="Haiku";; kdeneon) PRETTY_NAME="KDE Neon";; linuxmint-cinnamon) PRETTY_NAME="Linux Mint Cinnamon";; linuxmint-mate) PRETTY_NAME="Linux Mint MATE";; @@ -168,6 +169,7 @@ function os_support() { freebsd \ fedora \ garuda \ + haiku \ kali \ kdeneon \ kubuntu \ @@ -262,6 +264,11 @@ function releases_garuda() { cinnamon } +function releases_haiku() { + echo r1beta3-x86_64 \ + r1beta3-x86_gcc2h +} + function releases_kali() { echo latest \ weekly @@ -537,6 +544,9 @@ function make_vm_config() { elif [ "${OS}" == "garuda" ]; then GUEST="linux" IMAGE_TYPE="iso" + elif [ "${OS}" == "haiku" ]; then + GUEST="haiku" + IMAGE_TYPE="iso" elif [ "${OS}" == "kdeneon" ]; then GUEST="linux" IMAGE_TYPE="iso" @@ -611,6 +621,10 @@ EOF echo "disk_size=\"32G\"" >> "${OS}-${RELEASE}.conf" fi + if [ "${OS}" == "haiku" ]; then + echo "boot=\"legacy\"" >> "${OS}-${RELEASE}.conf" + fi + if [ "${OS}" == "oraclelinux" ]; then echo "disk_size=\"20G\"" >> "${OS}-${RELEASE}.conf" fi @@ -1185,6 +1199,21 @@ function get_garuda() { make_vm_config "${OS}-${RELEASE}.iso" } +function get_haiku() { + local ISO="" + local URL="" + local HASH="" + + validate_release "releases_haiku" + + ISO="haiku-${RELEASE}-anyboot.iso" + URL="https://cdn.haiku-os.org/haiku-release/$(echo $RELEASE | awk -F '-' '{print $1}')/${ISO}" + HASH=$(wget -q -O- ${URL}.sha256 | grep "${ISO}" | cut -d' ' -f4) + web_get "${URL}" "${VM_PATH}" + check_hash "${ISO}" "${HASH}" + make_vm_config "${ISO}" +} + function unattended_windows() { cat << 'EOF' > "${1}" @@ -1653,6 +1682,8 @@ if [ -n "${2}" ]; then get_fedora elif [ "${OS}" == "garuda" ]; then get_garuda + elif [ "${OS}" == "haiku" ]; then + get_haiku elif [ "${OS}" == "kali" ]; then get_kali elif [ "${OS}" == "kdeneon" ]; then @@ -1744,6 +1775,8 @@ else releases_fedora elif [ "${OS}" == "garuda" ]; then releases_garuda + elif [ "${OS}" == "haiku" ]; then + releases_haiku elif [ "${OS}" == "kali" ]; then releases_kali elif [[ "${OS}" == *"linuxmint-"* ]]; then From 98266009f039e2649f7c1e9de3d9f5fa167ee7f1 Mon Sep 17 00:00:00 2001 From: nqvrg <66185596+nqvrg@users.noreply.github.com> Date: Sun, 26 Dec 2021 16:07:25 +0100 Subject: [PATCH 19/47] Allow using a different chipset on quickemu Haiku is incompatible with the q35 machine type, as it emulates a ICH9 host chipset. Instad, the "pc" machine type needs to be used (emulates I44FX). https://wiki.qemu.org/Features/Q35 --- quickemu | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/quickemu b/quickemu index 5507580..7a73559 100755 --- a/quickemu +++ b/quickemu @@ -228,6 +228,7 @@ function vm_boot() { local KERNEL_NODE="" local KERNEL_VER="?" local LSB_DESCRIPTION="Unknown OS" + local MACHINE_TYPE="q35" local MAC_BOOTLOADER="" local MAC_MISSING="" local MAC_DISK_DEV="ide-hd,bus=ahci.2" @@ -463,6 +464,18 @@ function vm_boot() { disk_size="16G" fi ;; + haiku) + CPU="-cpu host,kvm=on" + MACHINE_TYPE="pc" + NET_DEVICE="rtl8139" + if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then + CPU="${CPU},topoext" + fi + if [ -z "${disk_size}" ]; then + disk_size="32G" + fi + echo "WARNING! Unrecognised guest OS: ${guest_os}" + ;; macos) #https://www.nicksherlock.com/2020/06/installing-macos-big-sur-on-proxmox/ # A CPU with SSE4.1 support is required for >= macOS Sierra @@ -833,7 +846,7 @@ function vm_boot() { # shellcheck disable=SC2054,SC2206,SC2140 args+=(-name ${VMNAME},process=${VMNAME} -pidfile "${VMDIR}/${VMNAME}.pid" - -enable-kvm -machine q35,smm=${SMM},vmport=off ${GUEST_TWEAKS} + -enable-kvm -machine ${MACHINE_TYPE},smm=${SMM},vmport=off ${GUEST_TWEAKS} ${CPU} ${SMP} -m ${RAM_VM} ${BALLOON} -smbios type=2,manufacturer="Quickemu Project",product="Quickemu",version="${VERSION}",serial="0xDEADBEEF",location="quickemu.com",asset="${VMNAME}" From 1f917c85c19a42532ef68ecd28ff41609aa2f868 Mon Sep 17 00:00:00 2001 From: nqvrg <66185596+nqvrg@users.noreply.github.com> Date: Sun, 26 Dec 2021 16:11:16 +0100 Subject: [PATCH 20/47] Add Haiku to README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 78ac412..62e904f 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ comprehensive support for macOS and Windows**. * [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/) + * [Haiku](https://www.haiku-os.org/) * Full SPICE support including host/guest clipboard sharing * VirtIO-webdavd file sharing for Linux and Windows guests * VirtIO-9p file sharing for Linux and macOS guests From 935b83a490863466cb7f9f394b3d42125e0f823b Mon Sep 17 00:00:00 2001 From: nqvrg <66185596+nqvrg@users.noreply.github.com> Date: Sun, 26 Dec 2021 18:27:17 +0100 Subject: [PATCH 21/47] Set an explicit disk size of 32G for Haiku --- quickget | 1 + 1 file changed, 1 insertion(+) diff --git a/quickget b/quickget index 577ad0c..46e465a 100755 --- a/quickget +++ b/quickget @@ -623,6 +623,7 @@ EOF if [ "${OS}" == "haiku" ]; then echo "boot=\"legacy\"" >> "${OS}-${RELEASE}.conf" + echo "disk_size=\"32G\"" >> "${OS}-${RELEASE}.conf" fi if [ "${OS}" == "oraclelinux" ]; then From aee9ea296c0abec040b0ed833f8d22eaaf96b302 Mon Sep 17 00:00:00 2001 From: nqvrg <66185596+nqvrg@users.noreply.github.com> Date: Sun, 26 Dec 2021 18:54:23 +0100 Subject: [PATCH 22/47] Add more info about Haiku to README.md Replacing second "BSD Guests" section, because it was duplicated above. --- README.md | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 62e904f..d11a907 100644 --- a/README.md +++ b/README.md @@ -330,15 +330,28 @@ tpm="on" * `fixed_iso=` specifies the ISO image that provides VirtIO drivers. * `tpm="on"` instructs `quickemu` to create a software emulated TPM device using `swtpm`. -## BSD Guests +## Haiku Guests -`quickemu` supports FreeBSD and OpenBSD. +`quickemu` supports [Haiku](https://www.haiku-os.org/). ```bash -quickget freebsd 13_0 -quickemu --vm freebsd-13_0.conf +quickget quickget haiku r1beta3-x86_64 +quickemu --vm haiku-r1beta3-x86_64.conf ``` +At the moment the only way to share files between host and a Haiku guest is by +using SSH (having a SSH server running on the host): + +On guest: + +```bash +scp example.txt user@host-local-ip:/home/user # sending a file from guest to host +scp user@host-local-ip:/home/user/example.txt . # receiving a file from host to guest +``` + +`quickget` cannot automatically download and create virtual machines for Haiku +nightly versions, but they work if the ISO and configuration are set up manually. + # SPICE The following features are available while using the SPICE protocol: From c3b08411a93a303140e97fe98f936d0118b9aa0e Mon Sep 17 00:00:00 2001 From: abe-101 Date: Sun, 26 Dec 2021 22:38:11 -0500 Subject: [PATCH 23/47] Update Debian version to 11.2.0 --- quickget | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/quickget b/quickget index 235fd9a..7625de4 100755 --- a/quickget +++ b/quickget @@ -220,14 +220,14 @@ function releases_archlinux() { # later refactor these DE variants like languages and avoid the arch ? # all these are available with a "nonfree" option too function releases_debian() { - echo 11.1.0-amd64-cinnamon \ - 11.1.0-amd64-gnome \ - 11.1.0-amd64-kde \ - 11.1.0-amd64-lxde \ - 11.1.0-amd64-lxqt \ - 11.1.0-amd64-mate \ - 11.1.0-amd64-standard \ - 11.1.0-amd64-xfce + echo 11.2.0-amd64-cinnamon \ + 11.2.0-amd64-gnome \ + 11.2.0-amd64-kde \ + 11.2.0-amd64-lxde \ + 11.2.0-amd64-lxqt \ + 11.2.0-amd64-mate \ + 11.2.0-amd64-standard \ + 11.2.0-amd64-xfce } function releases_elementary() { From 4fc02da75edbfbda2dff87c09956c308cbfe343b Mon Sep 17 00:00:00 2001 From: Vipin Mahawar Date: Mon, 27 Dec 2021 12:36:28 +0530 Subject: [PATCH 24/47] Added MX-Linux support --- README.md | 1 + quickget | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/README.md b/README.md index 78ac412..0cdafa3 100644 --- a/README.md +++ b/README.md @@ -185,6 +185,7 @@ preferred flavour. * `kali` * `kdeneon` * `linuxmint` + * `mxlinux` * `nixos` * `opensuse` * `oraclelinux` diff --git a/quickget b/quickget index 235fd9a..fefbf77 100755 --- a/quickget +++ b/quickget @@ -45,6 +45,9 @@ function pretty_name() { linuxmint-cinnamon) PRETTY_NAME="Linux Mint Cinnamon";; linuxmint-mate) PRETTY_NAME="Linux Mint MATE";; linuxmint-xfce) PRETTY_NAME="Linux Mint XFCE";; + mxlinux-xfce) PRETTY_NAME="MX Linux XFCE";; + mxlinux-kde) PRETTY_NAME="MX Linux KDE";; + mxlinux-fluxbox) PRETTY_NAME="MX Linux Fluxbox";; nixos-gnome) PRETTY_NAME="NixOS Gnome";; nixos-plasma5) PRETTY_NAME="NixOS KDE";; nixos-minimal) PRETTY_NAME="NixOS Minimal";; @@ -174,6 +177,9 @@ function os_support() { linuxmint-cinnamon \ linuxmint-mate \ linuxmint-xfce \ + mxlinux-xfce \ + mxlinux-kde \ + mxlinux-fluxbox \ nixos-gnome \ nixos-plasma5 \ nixos-minimal \ @@ -278,6 +284,10 @@ function releases_linuxmint(){ echo 20.2 } +function releases_mxlinux(){ + echo 21 +} + function releases_nixos(){ echo 21.05 \ 21.11 @@ -543,6 +553,9 @@ function make_vm_config() { elif [[ "${OS}" == *"linuxmint"* ]]; then GUEST="linux" IMAGE_TYPE="iso" + elif [[ "${OS}" == *"mxlinux"* ]]; then + GUEST="linux" + IMAGE_TYPE="iso" elif [[ "${OS}" == *"nixos"* ]]; then GUEST="linux" IMAGE_TYPE="iso" @@ -843,6 +856,37 @@ function get_linuxmint() { check_hash "${ISO}" "${HASH}" make_vm_config "${ISO}" } + +function get_mxlinux() { + local FLAVOR="" + local HASH="" + local ISO="" + local URL="" + local BASE_URL = "" + + validate_release "releases_mxlinux" + FLAVOR=$(echo "${OS}" | cut -d'-' -f2) + + if [[ "$FLAVOR" == "xfce" ]]; then + ISO="MX-${RELEASE}_x64.iso" + BASE_URL="https://anorien.csc.warwick.ac.uk/mirrors/mxlinux/isos/MX/Final/Xfce" + elif [[ "$FLAVOR" == "kde" ]]; then + ISO="MX-${RELEASE}_KDE_x64.iso" + BASE_URL="https://anorien.csc.warwick.ac.uk/mirrors/mxlinux/isos/MX/Final/KDE" + elif [[ "$FLAVOR" == "fluxbox" ]]; then + ISO="MX-${RELEASE}_fluxbox_x64.iso" + BASE_URL="https://anorien.csc.warwick.ac.uk/mirrors/mxlinux/isos/MX/Final/Fluxbox" + fi + + URL="${BASE_URL}/${ISO}" + web_get "${URL}" "${VM_PATH}" + web_get "${URL}.sha256" "${VM_PATH}" + HASH=$(cat "${VM_PATH}/${ISO}.sha256" | cut -d' ' -f1) + check_hash "${ISO}" "${HASH}" + make_vm_config "${ISO}" +} + + function get_nixos() { local FLAVOR="" local HASH="" @@ -1659,6 +1703,8 @@ if [ -n "${2}" ]; then get_kdeneon elif [[ "${OS}" == *"linuxmint-"* ]]; then get_linuxmint + elif [[ "${OS}" == *"mxlinux-"* ]]; then + get_mxlinux elif [[ "${OS}" == *"nixos-"* ]]; then get_nixos elif [ "${OS}" == "openbsd" ]; then @@ -1748,6 +1794,8 @@ else releases_kali elif [[ "${OS}" == *"linuxmint-"* ]]; then releases_linuxmint + elif [[ "${OS}" == *"mxlinux-"* ]]; then + releases_mxlinux elif [[ "${OS}" == *"nixos-"* ]]; then releases_nixos elif [ "${OS}" == "opensuse" ]; then From 599aa0769640e50b4f825cddc0a1b9ebadb5ad20 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Wed, 29 Dec 2021 18:06:58 +0530 Subject: [PATCH 25/47] Add manjaro support --- quickget | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/quickget b/quickget index 235fd9a..ac7dbfb 100755 --- a/quickget +++ b/quickget @@ -45,6 +45,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";; @@ -111,6 +119,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 @@ -174,6 +184,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 \ @@ -314,6 +332,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 @@ -543,6 +571,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" @@ -843,6 +874,42 @@ function get_linuxmint() { check_hash "${ISO}" "${HASH}" make_vm_config "${ISO}" } + +function get_manjaro() { + local FLAVOR="" + local HASH="" + local ISO="" + local URL="" + local VER="" + local DATE="" + local KERNEL="" + local KERNLTS="" + + validate_release "releases_manjaro" + FLAVOR=$(echo "${OS}" | cut -d'-' -f2) + case ${FLAVOR} in + xfce|kde|gnome) + VER="21.2.0" + DATE="211220" + KERNEL="515" + KERNLTS="510";; + budgie|cinnamon|deepin|i3|mate) + VER="21.1.2" + DATE="210907" + KERNEL="513";; + esac + if [[ ${RELEASE} == "full" ]]; then + ISO="manjaro-${FLAVOR}-${VER}-${DATE}-linux${KERNEL}.iso" + elif [[ ${RELEASE} == "minimal" ]]; then + ISO="manjaro-${FLAVOR}-${VER}-minimal-${DATE}-linux${KERNEL}.iso" + elif [[ ${RELEASE} == "minimal-lts" ]]; then + ISO="manjaro-${FLAVOR}-${VER}-minimal-${DATE}-linux${KERNLTS}.iso" + fi + URL="https://download.manjaro.org/${FLAVOR}/${VER}/${ISO}" + web_get "${URL}" "${VM_PATH}" + make_vm_config "${ISO}" +} + function get_nixos() { local FLAVOR="" local HASH="" @@ -1659,6 +1726,8 @@ if [ -n "${2}" ]; then get_kdeneon elif [[ "${OS}" == *"linuxmint-"* ]]; then get_linuxmint + elif [[ "${OS}" == *"manjaro-"* ]]; then + get_manjaro elif [[ "${OS}" == *"nixos-"* ]]; then get_nixos elif [ "${OS}" == "openbsd" ]; then @@ -1667,7 +1736,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) @@ -1748,6 +1817,8 @@ else releases_kali elif [[ "${OS}" == *"linuxmint-"* ]]; then releases_linuxmint + elif [[ "${OS}" == *"manjaro-"* ]]; then + releases_manjaro elif [[ "${OS}" == *"nixos-"* ]]; then releases_nixos elif [ "${OS}" == "opensuse" ]; then From 545fd393921556477450295db466cdd4c5fc8d54 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Wed, 29 Dec 2021 23:48:06 +0530 Subject: [PATCH 26/47] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 78ac412..7929966 100644 --- a/README.md +++ b/README.md @@ -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/), [Kali](https://www.kali.org/),[Garuda](https://garudalinux.org/), [ZorinOS](https://zorin.com/os/), [Manjaro](https://manjaro.org) & [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/) From 435e427c9c8810c299b9d99421fd2eaaa83cd0a8 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Thu, 30 Dec 2021 15:53:04 +0530 Subject: [PATCH 27/47] Add Alpine Linux support --- quickget | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/quickget b/quickget index 235fd9a..d8f5173 100755 --- a/quickget +++ b/quickget @@ -36,6 +36,7 @@ function pretty_name() { SIMPLE_NAME="${1}" case ${SIMPLE_NAME} in alma) PRETTY_NAME="Alma Linux";; + alpine) PRETTY_NAME="Alpine Linux";; android) PRETTY_NAME="Android x86";; archlinux) PRETTY_NAME="Arch Linux";; elementary) PRETTY_NAME="elementary OS";; @@ -161,6 +162,7 @@ function list_csv() { function os_support() { echo alma \ + alpine \ android \ archlinux \ debian \ @@ -202,6 +204,14 @@ function releases_alma() { 8.5 } +function releases_alpine() { + echo latest \ + 3.12 \ + 3.13 \ + 3.14 \ + 3.15 +} + function releases_android() { echo 9.0 \ 8.1 \ @@ -513,6 +523,9 @@ function make_vm_config() { if [ "${OS}" == "alma" ]; then GUEST="linux" IMAGE_TYPE="iso" + elif [ "${OS}" == "alpine" ]; then + GUEST="linux" + IMAGE_TYPE="iso" elif [ "${OS}" == "android" ]; then GUEST="linux" IMAGE_TYPE="iso" @@ -692,6 +705,31 @@ function get_alma() { check_hash "${ISO}" "${HASH}" make_vm_config "${ISO}" } + +function get_alpine() { + local HASH="" + local ISO="" + local URL="" + local VERSION="" + local BRANCH="" + + validate_release "releases_alpine" + if [[ "${RELEASE}" == "latest" ]]; then + BRANCH="latest-stable" + else + BRANCH="v${RELEASE}" + fi + VERSION=$(wget -qO- 'https://dl-cdn.alpinelinux.org/alpine/${BRANCH}/releases/x86_64/latest-releases.yaml' \ + | awk '/"Xen"/{found=0} {if(found) print} /"Virtual"/{found=1}' | grep 'version:' | awk '{print $2}') + ISO="alpine-virt-${VERSION}-x86_64.iso" + URL="https://dl-cdn.alpinelinux.org/alpine/${BRANCH}/releases/x86_64/${ISO}" + web_get "${URL}" "${VM_PATH}" + HASH=$(wget -qO- 'https://dl-cdn.alpinelinux.org/alpine/${BRANCH}/releases/x86_64/latest-releases.yaml' \ + | awk '/"Xen"/{found=0} {if(found) print} /"Virtual"/{found=1}' | grep 'sha256:' | awk '{print $2}') + check_hash "${ISO}" "${HASH}" + make_vm_config "${ISO}" +} + function get_archlinux() { local HASH="" local ISO="" @@ -1623,6 +1661,8 @@ if [ -n "${2}" ]; then fi VM_PATH="${OS}-${RELEASE}-${ISOTYPE}" get_alma "${ISOTYPE}" + elif [ "${OS}" == "alpine" ]; then + get_alpine elif [ "${OS}" == "android" ]; then get_android elif [ "${OS}" == "archlinux" ]; then @@ -1730,6 +1770,8 @@ else echo -n "ERROR! You must specify a release: " if [ "${OS}" == "alma" ]; then releases_alma + elif [ "${OS}" == "alpine" ]; then + releases_alpine elif [ "${OS}" == "android" ]; then releases_android elif [ "${OS}" == "archlinux" ]; then From b4c940e789f9696c0114ea13d30101121e637ca8 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Thu, 30 Dec 2021 15:53:40 +0530 Subject: [PATCH 28/47] Update quickget --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index d8f5173..d4db17a 100755 --- a/quickget +++ b/quickget @@ -36,7 +36,7 @@ function pretty_name() { SIMPLE_NAME="${1}" case ${SIMPLE_NAME} in alma) PRETTY_NAME="Alma Linux";; - alpine) PRETTY_NAME="Alpine Linux";; + alpine) PRETTY_NAME="Alpine Linux";; android) PRETTY_NAME="Android x86";; archlinux) PRETTY_NAME="Arch Linux";; elementary) PRETTY_NAME="elementary OS";; From 82885ef8c4146376cc7a1e1294f970077c35faa7 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Thu, 30 Dec 2021 16:06:22 +0530 Subject: [PATCH 29/47] Update quickget --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index ac7dbfb..f9bfaf0 100755 --- a/quickget +++ b/quickget @@ -571,7 +571,7 @@ function make_vm_config() { elif [[ "${OS}" == *"linuxmint"* ]]; then GUEST="linux" IMAGE_TYPE="iso" - elif [[ "${OS}" == *"manjaro"* }}; then + elif [[ "${OS}" == *"manjaro"* ]]; then GUEST="linux" IMAGE_TYPE="iso" elif [[ "${OS}" == *"nixos"* ]]; then From 3454f4fae04491ee760d958b9dc01dc476c37d7a Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Fri, 31 Dec 2021 17:05:00 +0530 Subject: [PATCH 30/47] Update quickget --- quickget | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/quickget b/quickget index d4db17a..cff4832 100755 --- a/quickget +++ b/quickget @@ -719,13 +719,12 @@ function get_alpine() { else BRANCH="v${RELEASE}" fi - VERSION=$(wget -qO- 'https://dl-cdn.alpinelinux.org/alpine/${BRANCH}/releases/x86_64/latest-releases.yaml' \ - | awk '/"Xen"/{found=0} {if(found) print} /"Virtual"/{found=1}' | grep 'version:' | awk '{print $2}') + MANIFESTURL="https://dl-cdn.alpinelinux.org/alpine/${BRANCH}/releases/x86_64/latest-releases.yaml" + VERSION=$(wget -qO- "${MANIFESTURL}" | awk '/"Xen"/{found=0} {if(found) print} /"Virtual"/{found=1}' | grep 'version:' | awk '{print $2}') ISO="alpine-virt-${VERSION}-x86_64.iso" URL="https://dl-cdn.alpinelinux.org/alpine/${BRANCH}/releases/x86_64/${ISO}" web_get "${URL}" "${VM_PATH}" - HASH=$(wget -qO- 'https://dl-cdn.alpinelinux.org/alpine/${BRANCH}/releases/x86_64/latest-releases.yaml' \ - | awk '/"Xen"/{found=0} {if(found) print} /"Virtual"/{found=1}' | grep 'sha256:' | awk '{print $2}') + HASH=$(wget -qO- "${MANIFESTURL}" | awk '/"Xen"/{found=0} {if(found) print} /"Virtual"/{found=1}' | grep 'sha256:' | awk '{print $2}') check_hash "${ISO}" "${HASH}" make_vm_config "${ISO}" } From cff1c450b76bd809928044c0bf354aee51120898 Mon Sep 17 00:00:00 2001 From: Vipin Mahawar Date: Fri, 31 Dec 2021 22:54:57 +0530 Subject: [PATCH 31/47] fix typo --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index fefbf77..cd4091b 100755 --- a/quickget +++ b/quickget @@ -862,7 +862,7 @@ function get_mxlinux() { local HASH="" local ISO="" local URL="" - local BASE_URL = "" + local BASE_URL="" validate_release "releases_mxlinux" FLAVOR=$(echo "${OS}" | cut -d'-' -f2) From 35d174d241fe4ea93dbf51f3a78033553018e316 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Sat, 1 Jan 2022 11:05:25 +0530 Subject: [PATCH 32/47] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 78ac412..70347dc 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ comprehensive support for macOS and Windows**. * [Debian](https://www.debian.org/) (bullseye with all the official and non-free DE variants) * [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/) + * [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/), [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/) @@ -177,6 +178,7 @@ preferred flavour. `quickget` also supports: * `alma` + * `alpine` * `archlinux` * `debian` * `elementary` From e33900a81e6eafa1d1a7a5f9437f02f35664bc75 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Sat, 1 Jan 2022 11:50:17 +0530 Subject: [PATCH 33/47] Auto Update Manjaro --- quickget | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/quickget b/quickget index f9bfaf0..6a5163c 100755 --- a/quickget +++ b/quickget @@ -877,36 +877,37 @@ function get_linuxmint() { function get_manjaro() { local FLAVOR="" + local MANIFESTURL="" + local ISOKEY="" + local HASHKEY="" local HASH="" local ISO="" local URL="" - local VER="" - local DATE="" - local KERNEL="" - local KERNLTS="" - + validate_release "releases_manjaro" FLAVOR=$(echo "${OS}" | cut -d'-' -f2) case ${FLAVOR} in - xfce|kde|gnome) - VER="21.2.0" - DATE="211220" - KERNEL="515" - KERNLTS="510";; - budgie|cinnamon|deepin|i3|mate) - VER="21.1.2" - DATE="210907" - KERNEL="513";; + xfce|kde|gnome) BRANCH="official";; + budgie|cinnamon|deepin|i3|mate) BRANCH="community";; esac + if [[ ${RELEASE} == "full" ]]; then - ISO="manjaro-${FLAVOR}-${VER}-${DATE}-linux${KERNEL}.iso" + KEY="Download_x64 = " + HASHKEY="Download_x64_Checksum = " elif [[ ${RELEASE} == "minimal" ]]; then - ISO="manjaro-${FLAVOR}-${VER}-minimal-${DATE}-linux${KERNEL}.iso" - elif [[ ${RELEASE} == "minimal-lts" ]]; then - ISO="manjaro-${FLAVOR}-${VER}-minimal-${DATE}-linux${KERNLTS}.iso" + KEY="Download_Minimal_x64 = " + HASHKEY="Download_Minimal_x64_Checksum = " + elif [[ ${RELEASE} == "minimal" ]]; then + KEY="Download_Minimal_lts = " + HASHKEY="Download_Minimal_x64_Checksum_lts = " fi - URL="https://download.manjaro.org/${FLAVOR}/${VER}/${ISO}" + + 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}') + ISO="$(echo $URL | awk -F "/" '{print $6}' | tr -d '"')" + HASH=$(wget -qO- ${MANIFESTURL} | grep "${HASHKEY}" | awk '{print $3}' | tr -d '"') web_get "${URL}" "${VM_PATH}" + check_hash "${ISO}" "${HASH}" make_vm_config "${ISO}" } From 7c21235ce8b9e6c0ef01d61cdcc1947924ec0ed7 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Sat, 1 Jan 2022 11:58:38 +0530 Subject: [PATCH 34/47] fix Manjaro unable to download iso --- quickget | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickget b/quickget index 6a5163c..e98803e 100755 --- a/quickget +++ b/quickget @@ -903,8 +903,8 @@ function get_manjaro() { 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}') - ISO="$(echo $URL | awk -F "/" '{print $6}' | tr -d '"')" + 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}" From ad3332ab3754162a012b99608c99ca9eb6b380a9 Mon Sep 17 00:00:00 2001 From: Sebastian Volland Date: Wed, 5 Jan 2022 17:50:09 +0100 Subject: [PATCH 35/47] Add support for Tails Linux --- quickget | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/quickget b/quickget index 235fd9a..0ab2da8 100755 --- a/quickget +++ b/quickget @@ -186,6 +186,7 @@ function os_support() { regolith \ rockylinux \ solus \ + tails \ ubuntu \ ubuntu-budgie \ ubuntu-kylin \ @@ -343,6 +344,10 @@ function releases_solus() { 4.3-plasma } +function releases_tails() { + echo stable +} + function releases_ubuntu() { echo bionic \ focal \ @@ -567,6 +572,9 @@ function make_vm_config() { elif [ "${OS}" == "solus" ]; then GUEST="linux" IMAGE_TYPE="iso" + elif [[ "${OS}" == "tails" ]]; then + GUEST="linux" + IMAGE_TYPE="iso" elif [[ "${OS}" == *"ubuntu"* ]]; then GUEST="linux" IMAGE_TYPE="iso" @@ -603,6 +611,10 @@ EOF echo "boot=\"legacy\"" >> "${OS}-${RELEASE}.conf" fi + if [ "${OS}" == "tails" ]; then + echo "boot=\"legacy\"" >> "${OS}-${RELEASE}.conf" + fi + if [ "${OS}" == "macos" ]; then echo "macos_release=\"${RELEASE}\"" >> "${OS}-${RELEASE}.conf" fi @@ -1100,6 +1112,18 @@ function get_regolith() { make_vm_config "${ISO}" } +function get_tails() { + validate_release "releases_tails" + + RELEASE_JSON_URL="https://tails.boum.org/install/v2/Tails/amd64/${RELEASE}/latest.json" + RELEASE_JSON="$(wget -q -O- "$RELEASE_JSON_URL")" + URL=$(echo "$RELEASE_JSON" | jq -r '.installations[0]."installation-paths"[]|select(.type=="iso")|."target-files"[0].url') + HASH=$(echo "$RELEASE_JSON" | jq -r '.installations[0]."installation-paths"[]|select(.type=="iso")|."target-files"[0].sha256') + ISO=$(echo "${URL}" | sed -e "s/.*\/\([^\/]*\)$/\1/") + web_get "${URL}" "${VM_PATH}" + check_hash "${ISO}" "${HASH}" + make_vm_config "${ISO}" +} function get_ubuntu() { local DEVEL="daily-live" @@ -1703,6 +1727,8 @@ if [ -n "${2}" ]; then get_rocky "${ISOTYPE}" elif [ "${OS}" == "solus" ]; then get_solus + elif [[ "${OS}" == "tails"* ]]; then + get_tails elif [[ "${OS}" == *"ubuntu"* ]]; then get_ubuntu elif [ "${OS}" == "windows" ]; then @@ -1766,6 +1792,8 @@ else releases_rockylinux elif [ "${OS}" == "solus" ]; then releases_solus + elif [[ "${OS}" == "tails"* ]]; then + releases_tails elif [[ "${OS}" == *"ubuntu"* ]]; then releases_ubuntu elif [ "${OS}" == "windows" ]; then From 3ef5ff47bc1d57fe7a6c03d16acd049ce4150aac Mon Sep 17 00:00:00 2001 From: zenobit Date: Sun, 16 Jan 2022 04:38:45 +0100 Subject: [PATCH 36/47] added initial support for void linux --- quickemu | 14 ++++++++++---- quickget | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/quickemu b/quickemu index 5507580..df15b80 100755 --- a/quickemu +++ b/quickemu @@ -393,8 +393,11 @@ function vm_boot() { EFI_CODE="/usr/share/OVMF/x64/OVMF_CODE.secboot.fd" efi_vars "/usr/share/OVMF/x64/OVMF_VARS.fd" "${EFI_VARS}" elif [ -e "/usr/share/edk2-ovmf/OVMF_CODE.fd" ]; then - EFI_CODE="/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd" - efi_vars "/usr/share/edk2-ovmf/OVMF_VARS.fd" "${EFI_VARS}" + EFI_CODE="/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd" + efi_vars "/usr/share/edk2-ovmf/OVMF_VARS.fd" "${EFI_VARS}" + elif [ -e "/usr/share/qemu/edk2-x86_64-secure-code.fd" ]; then + EFI_CODE="/usr/share/qemu/edk2-x86_64-secure-code.fd" + efi_vars "/usr/share/qemu/edk2-x86_64-code.fd" "${EFI_VARS}" else echo "ERROR! SecureBoot was requested but no SecureBoot capable firmware was found." echo " Please install OVMF firmware." @@ -415,8 +418,11 @@ function vm_boot() { EFI_CODE="/usr/share/OVMF/x64/OVMF_CODE.fd" efi_vars "/usr/share/OVMF/x64/OVMF_VARS.fd" "${EFI_VARS}" elif [ -e "/usr/share/edk2-ovmf/OVMF_CODE.fd" ]; then - EFI_CODE="/usr/share/edk2-ovmf/OVMF_CODE.fd" - efi_vars "/usr/share/edk2-ovmf/OVMF_VARS.fd" "${EFI_VARS}" + EFI_CODE="/usr/share/edk2-ovmf/OVMF_CODE.fd" + efi_vars "/usr/share/edk2-ovmf/OVMF_VARS.fd" "${EFI_VARS}" + elif [ -e "/usr/share/qemu/edk2-x86_64-code.fd" ]; then + EFI_CODE="/usr/share/qemu/edk2-x86_64-code.fd" + efi_vars "/usr/share/qemu/edk2-x86_64-code.fd" "${EFI_VARS}" else echo "ERROR! EFI boot requested but no EFI firmware found." echo " Please install OVMF firmware." diff --git a/quickget b/quickget index 235fd9a..6b4be89 100755 --- a/quickget +++ b/quickget @@ -59,6 +59,7 @@ function pretty_name() { ubuntu-kylin) PRETTY_NAME="Ubuntu Kylin";; ubuntu-mate) PRETTY_NAME="Ubuntu MATE";; ubuntu-studio) PRETTY_NAME="Ubuntu Studio";; + void) PRETTY_NAME="Void Linux";; zorin) PRETTY_NAME="Zorin OS";; *) PRETTY_NAME="${SIMPLE_NAME^}";; esac @@ -191,6 +192,7 @@ function os_support() { ubuntu-kylin \ ubuntu-mate \ ubuntu-studio \ + void \ windows \ xubuntu \ zorin @@ -352,6 +354,15 @@ function releases_ubuntu() { canary } +function releases_void() { + echo i686-20210930 \ + i686-20210930-xfce \ + x86_64-20210930 \ + x86_64-20210930-xfce \ + x86_64-musl-20210930 \ + x86_64-musl-20210930-xfce +} + function languages_windows() { LANGS=(Arabic "Brazilian Portuguese" @@ -570,6 +581,9 @@ function make_vm_config() { elif [[ "${OS}" == *"ubuntu"* ]]; then GUEST="linux" IMAGE_TYPE="iso" + elif [ "${OS}" == "void" ]; then + GUEST="linux" + IMAGE_TYPE="iso" elif [ "${OS}" == "macos" ]; then GUEST="macos" IMAGE_TYPE="img" @@ -615,6 +629,10 @@ EOF echo "disk_size=\"20G\"" >> "${OS}-${RELEASE}.conf" fi + if [ "${OS}" == "void" ]; then + echo "disk_size=\"20G\"" >> "${OS}-${RELEASE}.conf" + fi + if [ "${OS}" == "zorin" ]; then case ${RELEASE} in 15education64|15edulite64|15edulite32) @@ -842,6 +860,7 @@ function get_linuxmint() { web_get "${URL}" "${VM_PATH}" check_hash "${ISO}" "${HASH}" make_vm_config "${ISO}" + } function get_nixos() { local FLAVOR="" @@ -857,6 +876,7 @@ function get_nixos() { web_get "${URL}" "${VM_PATH}" check_hash "${ISO}" "${HASH}" make_vm_config "${ISO}" + } function get_openbsd() { local HASH="" @@ -872,6 +892,23 @@ function get_openbsd() { make_vm_config "${ISO}" } +function get_void() { + local FLAVOR="" + local HASH="" + local ISO="" + local URL="" + local arch="x86_64" + # TODO: only one hardcoded version of void added.. Add more and make it automatic + if + validate_release "releases_void" + URL="https://alpha.de.repo.voidlinux.org/live/current" + ISO="void-live-x86_64-20210930-xfce.iso" + #ISO="void-live-${ARCH}${LIBC}-${VERSION}-${FLAVOR}.iso" + web_get "${URL}/${ISO}" "${VM_PATH}" + check_hash "${ISO}" "${HASH}" + make_vm_config "${ISO}" +} + function get_zorin() { local ISO="" local URL="" @@ -1149,6 +1186,7 @@ function get_ubuntu() { make_vm_config "${ISO}" fi } + function get_garuda() { local HASH="" local ISO="" @@ -1480,7 +1518,6 @@ function unattended_windows() { EOF } - function dbg_windows() { local DEBUG=0 if [ ${DEBUG} -eq 1 ]; then @@ -1627,6 +1664,8 @@ if [ -n "${2}" ]; then get_android elif [ "${OS}" == "archlinux" ]; then get_archlinux + elif [ "${OS}" == "void" ]; then + get_void elif [ "${OS}" == "debian" ]; then if [ -n "${3}" ]; then FREEDOM="${3}" @@ -1768,6 +1807,8 @@ else releases_solus elif [[ "${OS}" == *"ubuntu"* ]]; then releases_ubuntu + elif [ "${OS}" == "void" ]; then + releases_void elif [ "${OS}" == "windows" ]; then releases_windows elif [ "${OS}" == "zorin" ]; then From d06681506f25b4d65c31bdc5c24f16522582652c Mon Sep 17 00:00:00 2001 From: Phil Date: Mon, 17 Jan 2022 00:48:40 +0000 Subject: [PATCH 37/47] updated elementary to 6.1 --- quickget | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/quickget b/quickget index c6067c0..273babb 100755 --- a/quickget +++ b/quickget @@ -231,7 +231,7 @@ function releases_debian() { } function releases_elementary() { - echo 6.0 + echo 6.1 } function releases_freebsd(){ @@ -742,10 +742,9 @@ function get_elementary() { local URL="" local B66tim="" - validate_release "releases_elementary" B66tim=$(date +%s | base64 ) - ISO="elementaryos-${RELEASE}-stable.20211130.iso" + ISO="elementaryos-${RELEASE}-stable.20211218-rc.iso" # TODO: derive region from geoIP URL="https://ams3.dl.elementary.io/download/${B66tim}=/${ISO}" web_get "${URL}" "${VM_PATH}" From 8adbae8e2322dcab683123ec4a516a072f660c01 Mon Sep 17 00:00:00 2001 From: Phil Date: Mon, 17 Jan 2022 01:03:43 +0000 Subject: [PATCH 38/47] slight tweak after confirming only latest release is available --- quickget | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/quickget b/quickget index 273babb..9b4625a 100755 --- a/quickget +++ b/quickget @@ -741,10 +741,11 @@ function get_elementary() { local ISO="" local URL="" local B66tim="" + local isotag="20211218-rc" validate_release "releases_elementary" B66tim=$(date +%s | base64 ) - ISO="elementaryos-${RELEASE}-stable.20211218-rc.iso" + ISO="elementaryos-${RELEASE}-stable.${isotag}.iso" # TODO: derive region from geoIP URL="https://ams3.dl.elementary.io/download/${B66tim}=/${ISO}" web_get "${URL}" "${VM_PATH}" From 5e7dce6d825c5842306e4b2f075837ccf8ef90c7 Mon Sep 17 00:00:00 2001 From: Phil Date: Mon, 17 Jan 2022 05:38:57 +0000 Subject: [PATCH 39/47] Fixes to kolibrios removed 7z dependency and corrected errors. --- quickget | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/quickget b/quickget index ddaebed..fe7b12b 100755 --- a/quickget +++ b/quickget @@ -340,7 +340,7 @@ function releases_kdeneon() { } function releases_kolibrios() { - echo latest-iso + echo latest } function releases_linuxmint(){ @@ -1043,12 +1043,14 @@ function get_kolibrios() { local URL="" validate_release "releases_kolibrios" - URL="https://builds.kolibrios.org/eng/${RELEASE}.7z" + #URL="https://builds.kolibrios.org/eng/${RELEASE}.7z" + ISO="kolibri.iso" + URL="https://builds.kolibrios.org/eng/${ISO}" web_get "${URL}" "${VM_PATH}" - 7z e "${VM_PATH}/${RELEASE}.7z" "kolibri.iso" - ISO="kolibrios-${RELEASE}.iso" - mv "kolibri.iso" "${VM_PATH}/${ISO}" - rm "${VM_PATH}/${RELEASE}.7z" + #7z e "${VM_PATH}/${RELEASE}.7z" "kolibri.iso" + #ISO="kolibrios-${RELEASE}.iso" + #mv "kolibri.iso" "${VM_PATH}/${ISO}" + #rm "${VM_PATH}/${RELEASE}.7z" make_vm_config "${ISO}" } From dbd0a7dc33ff914eecfce9d182e0a04cad881ee4 Mon Sep 17 00:00:00 2001 From: Phil Date: Mon, 17 Jan 2022 06:26:36 +0000 Subject: [PATCH 40/47] Fewer future collissions --- README.md | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0aa98eb..c744d8a 100644 --- a/README.md +++ b/README.md @@ -32,14 +32,29 @@ comprehensive support for macOS and Windows**. * **Windows** 8.1, 10 and 11 including TPM 2.0 * [Ubuntu](https://ubuntu.com/desktop) and all the **[official Ubuntu flavours](https://ubuntu.com/download/flavours)** * [Debian](https://www.debian.org/) (bullseye with all the official and non-free DE variants) - * [Fedora](https://getfedora.org/) & openSUSE ([Leap](https://get.opensuse.org/leap/), [Tumbleweed](https://get.opensuse.org/tumbleweed/), [MicroOS](https://microos.opensuse.org/)) + * [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/) * [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/), [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/) + * [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/) + , [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/) + * [FreeBSD](https://www.freebsd.org/) + & [OpenBSD](https://www.openbsd.org/) * [Haiku](https://www.haiku-os.org/) * Full SPICE support including host/guest clipboard sharing * VirtIO-webdavd file sharing for Linux and Windows guests From ee6daedb4e40a0b364842088bfb634fef56abc74 Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Sat, 29 Jan 2022 15:24:12 +0000 Subject: [PATCH 41/47] Fixes #330 (#13) erroneous and confusing release outputs fixed --- quickget | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/quickget b/quickget index fe7b12b..598aba1 100755 --- a/quickget +++ b/quickget @@ -273,14 +273,14 @@ function releases_arcolinux() { # later refactor these DE variants like languages and avoid the arch ? # all these are available with a "nonfree" option too function releases_debian() { - echo 11.2.0-amd64-cinnamon \ - 11.2.0-amd64-gnome \ - 11.2.0-amd64-kde \ - 11.2.0-amd64-lxde \ - 11.2.0-amd64-lxqt \ - 11.2.0-amd64-mate \ - 11.2.0-amd64-standard \ - 11.2.0-amd64-xfce + echo cinnamon \ + gnome \ + kde \ + lxde \ + lxqt \ + mate \ + standard \ + xfce } function releases_cachyos() { echo 2022.01.09 From 5e8d6d97d39c46ad86e57c497d6e90e6460ad276 Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Sun, 30 Jan 2022 03:56:24 +0000 Subject: [PATCH 42/47] fixed mxlinux list bug --- quickget | 2 ++ 1 file changed, 2 insertions(+) diff --git a/quickget b/quickget index 598aba1..acc89c6 100755 --- a/quickget +++ b/quickget @@ -130,6 +130,8 @@ function list_csv() { FUNC="linuxmint" elif [[ "${OS}" == *"manjaro"* ]]; then FUNC="manjaro" + elif [[ "${OS}" == *"mxlinux"* ]]; then + FUNC="mxlinux" elif [[ "${OS}" == *"nixos"* ]]; then FUNC="nixos" else From 18f92bc7852c9df95a21c644225e26b07d213142 Mon Sep 17 00:00:00 2001 From: zenobit <6384793+zen0bit@users.noreply.github.com> Date: Sun, 30 Jan 2022 18:46:55 +0100 Subject: [PATCH 43/47] fix --- quickget | 1 - 1 file changed, 1 deletion(-) diff --git a/quickget b/quickget index 6b4be89..a7b77d4 100755 --- a/quickget +++ b/quickget @@ -899,7 +899,6 @@ function get_void() { local URL="" local arch="x86_64" # TODO: only one hardcoded version of void added.. Add more and make it automatic - if validate_release "releases_void" URL="https://alpha.de.repo.voidlinux.org/live/current" ISO="void-live-x86_64-20210930-xfce.iso" From 3d30f8b1d76ac658d2db8c347fc0a267134eb00b Mon Sep 17 00:00:00 2001 From: zenobit <6384793+zen0bit@users.noreply.github.com> Date: Mon, 31 Jan 2022 01:15:53 +0100 Subject: [PATCH 44/47] Update quickget --- quickget | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/quickget b/quickget index a7b77d4..1e12803 100755 --- a/quickget +++ b/quickget @@ -893,16 +893,34 @@ function get_openbsd() { } function get_void() { - local FLAVOR="" local HASH="" local ISO="" local URL="" - local arch="x86_64" - # TODO: only one hardcoded version of void added.. Add more and make it automatic + local HASH_URL="" + validate_release "releases_void" - URL="https://alpha.de.repo.voidlinux.org/live/current" - ISO="void-live-x86_64-20210930-xfce.iso" - #ISO="void-live-${ARCH}${LIBC}-${VERSION}-${FLAVOR}.iso" + DATE=$(wget -q -O- "https://mirror.fit.cvut.cz/voidlinux/live/current/sha256sum.txt" | awk 'NR == 1' |cut -d'.' -f1| cut -d'-' -f4) + URL="http://mirror.fit.cvut.cz/voidlinux/live/current" + case ${RELEASE} in + base) + ISO="void-live-x86_64-${DATE}.iso";; + musl) + ISO="void-live-x86_64-musl-${DATE}.iso";; + xfce) + ISO="void-live-x86_64-${DATE}-xfce.iso";; + xfce-musl) + ISO="void-live-x86_64-musl-${DATE}-xfce.iso";; + esac + case ${RELEASE} in + base) + HASH="$(wget -q -O- "https://mirror.fit.cvut.cz/voidlinux/live/current/sha256sum.txt" | grep "void-live-x86_64-${DATE}.iso" | cut -d' ' -f4)";; + musl) + HASH="$(wget -q -O- "https://mirror.fit.cvut.cz/voidlinux/live/current/sha256sum.txt" | grep "void-live-x86_64-musl-${DATE}.iso" | cut -d' ' -f4)";; + xfce) + HASH="$(wget -q -O- "https://mirror.fit.cvut.cz/voidlinux/live/current/sha256sum.txt" | grep "void-live-x86_64-${DATE}-xfce.iso" | cut -d' ' -f4)";; + xfce-musl) + HASH="$(wget -q -O- "https://mirror.fit.cvut.cz/voidlinux/live/current/sha256sum.txt" | grep "void-live-x86_64-musl-${DATE}.iso" | cut -d' ' -f4)";; + esac web_get "${URL}/${ISO}" "${VM_PATH}" check_hash "${ISO}" "${HASH}" make_vm_config "${ISO}" From 6de821561c38bcb127f54b5d31c724dd6f89140c Mon Sep 17 00:00:00 2001 From: zenobit <6384793+zen0bit@users.noreply.github.com> Date: Mon, 31 Jan 2022 01:25:02 +0100 Subject: [PATCH 45/47] Update quickget --- quickget | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/quickget b/quickget index 1e12803..e0ffc72 100755 --- a/quickget +++ b/quickget @@ -355,12 +355,10 @@ function releases_ubuntu() { } function releases_void() { - echo i686-20210930 \ - i686-20210930-xfce \ - x86_64-20210930 \ - x86_64-20210930-xfce \ - x86_64-musl-20210930 \ - x86_64-musl-20210930-xfce + echo base \ + musl \ + xfce \ + xfce-musl } function languages_windows() { From 1560060d62a2e57058b3cf85b9dc879bbca7622b Mon Sep 17 00:00:00 2001 From: Phil Date: Mon, 31 Jan 2022 03:19:45 +0000 Subject: [PATCH 46/47] correction to secureboot firmware --- quickemu | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/quickemu b/quickemu index 89b1cf0..d117ae0 100755 --- a/quickemu +++ b/quickemu @@ -384,7 +384,7 @@ function vm_boot() { # https://bugzilla.redhat.com/show_bug.cgi?id=1929357#c5 case ${secureboot} in on) - if [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then + if [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then EFI_CODE="/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" efi_vars "/usr/share/OVMF/OVMF_VARS_4M.fd" "${EFI_VARS}" elif [ -e "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd" ]; then @@ -393,7 +393,13 @@ function vm_boot() { elif [ -e "/usr/share/OVMF/x64/OVMF_CODE.secboot.fd" ]; then EFI_CODE="/usr/share/OVMF/x64/OVMF_CODE.secboot.fd" efi_vars "/usr/share/OVMF/x64/OVMF_VARS.fd" "${EFI_VARS}" - elif [ -e "/usr/share/edk2-ovmf/OVMF_CODE.fd" ]; then + elif [ -e "/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd" ]; then + EFI_CODE="/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd" + efi_vars "/usr/share/edk2-ovmf/OVMF_VARS.fd" "${EFI_VARS}" + elif [ -e "/usr/share/qemu/ovmf-x86_64-smm-ms-code.bin" ]; then + EFI_CODE="/usr/share/qemu/ovmf-x86_64-smm-ms-code.bin" + efi_vars "/usr/share/qemu/ovmf-x86_64-smm-ms-vars.bin" "${EFI_VARS}" + elif [ -e "/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd" ]; then EFI_CODE="/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd" efi_vars "/usr/share/edk2-ovmf/OVMF_VARS.fd" "${EFI_VARS}" elif [ -e "/usr/share/qemu/edk2-x86_64-secure-code.fd" ]; then From 506ddff59b9a9c6df7e95f2bfc024590f0f08f1c Mon Sep 17 00:00:00 2001 From: Phil Date: Mon, 31 Jan 2022 10:56:24 +0000 Subject: [PATCH 47/47] Moved MX-Linux source to official sourceforge As requested by @SwampRabbit --- quickget | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quickget b/quickget index ef4b50a..5c639fd 100755 --- a/quickget +++ b/quickget @@ -1137,13 +1137,13 @@ function get_mxlinux() { if [[ "$FLAVOR" == "xfce" ]]; then ISO="MX-${RELEASE}_x64.iso" - BASE_URL="https://anorien.csc.warwick.ac.uk/mirrors/mxlinux/isos/MX/Final/Xfce" + BASE_URL="https://sourceforge.net/projects/mx-linux/files/Final/Xfce/" elif [[ "$FLAVOR" == "kde" ]]; then ISO="MX-${RELEASE}_KDE_x64.iso" - BASE_URL="https://anorien.csc.warwick.ac.uk/mirrors/mxlinux/isos/MX/Final/KDE" + BASE_URL="https://sourceforge.net/projects/mx-linux/files/Final/KDE/" elif [[ "$FLAVOR" == "fluxbox" ]]; then ISO="MX-${RELEASE}_fluxbox_x64.iso" - BASE_URL="https://anorien.csc.warwick.ac.uk/mirrors/mxlinux/isos/MX/Final/Fluxbox" + BASE_URL="https://sourceforge.net/projects/mx-linux/files/Final/Fluxbox/" fi URL="${BASE_URL}/${ISO}"