From 6545f87cdf03d8057ec45dfe9a48d40b951d9a3e Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Mon, 26 Jun 2023 17:13:24 +0100 Subject: [PATCH 01/31] Move Ubuntu 22.10 releases into eol --- quickget | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/quickget b/quickget index 756eb8239d..840b631e8e 100755 --- a/quickget +++ b/quickget @@ -596,7 +596,7 @@ function releases_truenas-scale() { function releases_ubuntu() { local LTS_SUPPORT="14.04 16.04 18.04 20.04 22.04" - local INTERIM_SUPPORT="22.10 23.04" + local INTERIM_SUPPORT="23.04" case "${OS}" in kubuntu|lubuntu|ubuntukylin|\ @@ -612,7 +612,7 @@ function releases_ubuntu() { INTERIM_SUPPORT="${INTERIM_SUPPORT}" ;; ubuntucinnamon) - INTERIM_SUPPORT="${INTERIM_SUPPORT/22.10 /}" + INTERIM_SUPPORT="${INTERIM_SUPPORT}" ;; esac @@ -665,13 +665,14 @@ function releases_ubuntu() { eol-20.10 \ eol-21.04 \ eol-21.10 \ + eol-22.10 \ ; fi } function releases_ubuntu-server() { local LTS_SUPPORT="18.04 20.04 22.04" - local INTERIM_SUPPORT="22.10 23.04" + local INTERIM_SUPPORT="23.04" echo ${LTS_SUPPORT} \ ${INTERIM_SUPPORT} \ daily-live From 4226c5ac27c62206d5a770507197f7bc5ff02bcd Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Tue, 27 Jun 2023 18:01:13 +0100 Subject: [PATCH 02/31] docs: Add Ventura to supported MacOS releases --- README.md | 9 +++++---- build-docs | 2 +- docs/quickemu.1 | 11 +++++++---- docs/quickemu.1.md | 11 ++++++----- docs/quickemu_conf.1 | 2 +- docs/quickemu_conf.1.md | 2 +- docs/quickget.1 | 11 +++++++---- docs/quickget.1.md | 11 ++++++----- 8 files changed, 34 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index ac97e9c89c..a7db05a77c 100644 --- a/README.md +++ b/README.md @@ -325,8 +325,8 @@ quickget macos catalina quickemu --vm macos-catalina.conf ``` -macOS `high-sierra`, `mojave`, `catalina`, `big-sur` and `monterey` are -supported. +macOS `high-sierra`, `mojave`, `catalina`, `big-sur`, `monterey` and +`ventura` are supported. - Use cursor keys and enter key to select the **macOS Base System** - From **macOS Utilities** @@ -336,8 +336,8 @@ supported. click **Erase**. - Enter a `Name:` for the disk - If you are installing macOS Mojave or later (Catalina, Big - Sur, and Monterey), choose any of the APFS options as the - filesystem. MacOS Extended may not work. + Sur, Monterey and Ventura), choose any of the APFS options + as the filesystem. MacOS Extended may not work. - Click **Erase**. - Click **Done**. - Close Disk Utility @@ -413,6 +413,7 @@ There are some considerations when running macOS via Quickemu. - Catalina **(Recommended)** - Big Sur - Monterey + - Ventura - `quickemu` will automatically download the required [OpenCore](https://github.com/acidanthera/OpenCorePkg) bootloader and OVMF firmware from [OSX-KVM](https://github.com/kholia/OSX-KVM). diff --git a/build-docs b/build-docs index 5bd40cb6bf..e33d8263e0 160000 --- a/build-docs +++ b/build-docs @@ -1 +1 @@ -Subproject commit 5bd40cb6bfbf21493c2cde258d09d0cab9ad3ff8 +Subproject commit e33d8263e0d19d8ad9ef16d1dc00274b9a0ab4bf diff --git a/docs/quickemu.1 b/docs/quickemu.1 index a9d71d50c3..4c20d6d2c9 100644 --- a/docs/quickemu.1 +++ b/docs/quickemu.1 @@ -14,7 +14,7 @@ . ftr VB CB . ftr VBI CBI .\} -.TH "QUICKEMU" "1" "June 14, 2023" "quickemu" "Quickemu User Manual" +.TH "QUICKEMU" "1" "June 27, 2023" "quickemu" "Quickemu User Manual" .hy .SH NAME .PP @@ -490,7 +490,8 @@ quickemu --vm macos-catalina.conf .fi .PP macOS \f[V]high-sierra\f[R], \f[V]mojave\f[R], \f[V]catalina\f[R], -\f[V]big-sur\f[R] and \f[V]monterey\f[R] are supported. +\f[V]big-sur\f[R], \f[V]monterey\f[R] and \f[V]ventura\f[R] are +supported. .IP \[bu] 2 Use cursor keys and enter key to select the \f[B]macOS Base System\f[R] .IP \[bu] 2 @@ -506,8 +507,8 @@ click \f[B]Erase\f[R]. .IP \[bu] 2 Enter a \f[V]Name:\f[R] for the disk .IP \[bu] 2 -If you are installing macOS Mojave or later (Catalina, Big Sur, and -Monterey), choose any of the APFS options as the filesystem. +If you are installing macOS Mojave or later (Catalina, Big Sur, Monterey +and Ventura), choose any of the APFS options as the filesystem. MacOS Extended may not work. .RE .IP \[bu] 2 @@ -626,6 +627,8 @@ Catalina \f[B](Recommended)\f[R] Big Sur .IP \[bu] 2 Monterey +.IP \[bu] 2 +Ventura .RE .IP \[bu] 2 \f[V]quickemu\f[R] will automatically download the required diff --git a/docs/quickemu.1.md b/docs/quickemu.1.md index f21b88485c..7de2871255 100644 --- a/docs/quickemu.1.md +++ b/docs/quickemu.1.md @@ -1,6 +1,6 @@ --- author: Martin Wimpress -date: June 14, 2023 +date: June 27, 2023 footer: quickemu header: Quickemu User Manual section: 1 @@ -349,8 +349,8 @@ quickget macos catalina quickemu --vm macos-catalina.conf ``` -macOS `high-sierra`, `mojave`, `catalina`, `big-sur` and `monterey` are -supported. +macOS `high-sierra`, `mojave`, `catalina`, `big-sur`, `monterey` and +`ventura` are supported. - Use cursor keys and enter key to select the **macOS Base System** - From **macOS Utilities** @@ -360,8 +360,8 @@ supported. click **Erase**. - Enter a `Name:` for the disk - If you are installing macOS Mojave or later (Catalina, Big - Sur, and Monterey), choose any of the APFS options as the - filesystem. MacOS Extended may not work. + Sur, Monterey and Ventura), choose any of the APFS options + as the filesystem. MacOS Extended may not work. - Click **Erase**. - Click **Done**. - Close Disk Utility @@ -443,6 +443,7 @@ There are some considerations when running macOS via Quickemu. - Catalina **(Recommended)** - Big Sur - Monterey + - Ventura - `quickemu` will automatically download the required [OpenCore](https://github.com/acidanthera/OpenCorePkg) bootloader and OVMF firmware from [OSX-KVM](https://github.com/kholia/OSX-KVM). diff --git a/docs/quickemu_conf.1 b/docs/quickemu_conf.1 index 2e56c8f648..594cbc48c1 100644 --- a/docs/quickemu_conf.1 +++ b/docs/quickemu_conf.1 @@ -14,7 +14,7 @@ . ftr VB CB . ftr VBI CBI .\} -.TH "QUICKEMU_CONF" "1" "June 14, 2023" "quickemu_conf" "Quickemu Configuration Manual" +.TH "QUICKEMU_CONF" "1" "June 27, 2023" "quickemu_conf" "Quickemu Configuration Manual" .hy .SH NAME .PP diff --git a/docs/quickemu_conf.1.md b/docs/quickemu_conf.1.md index 18ca1c3ddd..71b962f905 100644 --- a/docs/quickemu_conf.1.md +++ b/docs/quickemu_conf.1.md @@ -1,6 +1,6 @@ --- author: Martin Wimpress -date: June 14, 2023 +date: June 27, 2023 footer: quickemu_conf header: Quickemu Configuration Manual section: 1 diff --git a/docs/quickget.1 b/docs/quickget.1 index 5365530c66..8bdbc1703c 100644 --- a/docs/quickget.1 +++ b/docs/quickget.1 @@ -14,7 +14,7 @@ . ftr VB CB . ftr VBI CBI .\} -.TH "QUICKGET" "1" "June 14, 2023" "quickget" "Quickget User Manual" +.TH "QUICKGET" "1" "June 27, 2023" "quickget" "Quickget User Manual" .hy .SH NAME .PP @@ -273,7 +273,8 @@ quickemu --vm macos-catalina.conf .fi .PP macOS \f[V]high-sierra\f[R], \f[V]mojave\f[R], \f[V]catalina\f[R], -\f[V]big-sur\f[R] and \f[V]monterey\f[R] are supported. +\f[V]big-sur\f[R], \f[V]monterey\f[R] and \f[V]ventura\f[R] are +supported. .IP \[bu] 2 Use cursor keys and enter key to select the \f[B]macOS Base System\f[R] .IP \[bu] 2 @@ -289,8 +290,8 @@ click \f[B]Erase\f[R]. .IP \[bu] 2 Enter a \f[V]Name:\f[R] for the disk .IP \[bu] 2 -If you are installing macOS Mojave or later (Catalina, Big Sur, and -Monterey), choose any of the APFS options as the filesystem. +If you are installing macOS Mojave or later (Catalina, Big Sur, Monterey +and Ventura), choose any of the APFS options as the filesystem. MacOS Extended may not work. .RE .IP \[bu] 2 @@ -409,6 +410,8 @@ Catalina \f[B](Recommended)\f[R] Big Sur .IP \[bu] 2 Monterey +.IP \[bu] 2 +Ventura .RE .IP \[bu] 2 \f[V]quickemu\f[R] will automatically download the required diff --git a/docs/quickget.1.md b/docs/quickget.1.md index de59e7c9f8..5bb5f223fb 100644 --- a/docs/quickget.1.md +++ b/docs/quickget.1.md @@ -1,6 +1,6 @@ --- author: Martin Wimpress -date: June 14, 2023 +date: June 27, 2023 footer: quickget header: Quickget User Manual section: 1 @@ -181,8 +181,8 @@ quickget macos catalina quickemu --vm macos-catalina.conf ``` -macOS `high-sierra`, `mojave`, `catalina`, `big-sur` and `monterey` are -supported. +macOS `high-sierra`, `mojave`, `catalina`, `big-sur`, `monterey` and +`ventura` are supported. - Use cursor keys and enter key to select the **macOS Base System** - From **macOS Utilities** @@ -192,8 +192,8 @@ supported. click **Erase**. - Enter a `Name:` for the disk - If you are installing macOS Mojave or later (Catalina, Big - Sur, and Monterey), choose any of the APFS options as the - filesystem. MacOS Extended may not work. + Sur, Monterey and Ventura), choose any of the APFS options + as the filesystem. MacOS Extended may not work. - Click **Erase**. - Click **Done**. - Close Disk Utility @@ -275,6 +275,7 @@ There are some considerations when running macOS via Quickemu. - Catalina **(Recommended)** - Big Sur - Monterey + - Ventura - `quickemu` will automatically download the required [OpenCore](https://github.com/acidanthera/OpenCorePkg) bootloader and OVMF firmware from [OSX-KVM](https://github.com/kholia/OSX-KVM). From ae15443da0a9577ecea784970d03f834c9539e8b Mon Sep 17 00:00:00 2001 From: SafaSafari Date: Tue, 10 Oct 2023 12:51:32 +0330 Subject: [PATCH 03/31] Fix ventura RecoveryImage download --- quickget | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/quickget b/quickget index 840b631e8e..ac17afe684 100755 --- a/quickget +++ b/quickget @@ -1433,7 +1433,8 @@ function get_macos() { monterey) #12 BOARD_ID="Mac-E43C1C25D4880AD6";; ventura) #13 - BOARD_ID="Mac-7BA5B2D9E42DDD94";; + BOARD_ID="Mac-7BA5B2D9E42DDD94" + OS_TYPE="latest";; *) echo "ERROR! Unknown release: ${RELEASE}" releases_macos exit 1;; From 9786f0d520ae8a624b657d55d428f513ae2c869c Mon Sep 17 00:00:00 2001 From: zenobit Date: Mon, 16 Oct 2023 11:48:52 +0200 Subject: [PATCH 04/31] elementary: 7.1 (#791) * elementaryos: version 7.1 * elementary: added hash for 7.1 --- quickget | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/quickget b/quickget index ac17afe684..7c655ed120 100755 --- a/quickget +++ b/quickget @@ -336,7 +336,7 @@ function releases_dragonflybsd() { } function releases_elementary() { - echo 7.0 + echo 7.0 7.1 } function releases_endeavouros() { @@ -1202,12 +1202,13 @@ function get_dragonflybsd() { function get_elementary() { local HASH="" case ${RELEASE} in - 6.2) - local ISO="elementaryos-${RELEASE}-stable.20211218-rc.iso" - ;; 7.0) local ISO="elementaryos-${RELEASE}-stable.20230129rc.iso" ;; + 7.1) + local ISO="elementaryos-${RELEASE}-stable.20230926rc.iso" + HASH="5c7f6b388e5787c366587985301ea05ab16e4cc0de3be2b3d6a559ce81a2f102" + ;; esac local URL="https://ams3.dl.elementary.io/download" echo "${URL}/$(date +%s | base64)/${ISO} ${HASH}" From 4e516f74558276cd9da59feda18ae7930228b596 Mon Sep 17 00:00:00 2001 From: zenobit Date: Mon, 16 Oct 2023 11:50:51 +0200 Subject: [PATCH 05/31] fix nproc (#780) Better handling available cores --- quickemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickemu b/quickemu index 4f4d6025a9..638af8b038 100755 --- a/quickemu +++ b/quickemu @@ -253,7 +253,7 @@ function vm_boot() { echo "Quickemu ${VERSION} using ${QEMU} v${QEMU_VER_LONG}" echo " - Host: ${LSB_DESCRIPTION} running ${KERNEL_NAME} ${KERNEL_VER} ${KERNEL_NODE}" - HOST_CPU_CORES=$(nproc --all) + HOST_CPU_CORES=$(nproc) HOST_CPU_MODEL=$(lscpu | grep '^Model name:' | cut -d':' -f2 | sed 's/ //g') HOST_CPU_SOCKETS=$(lscpu | grep -E 'Socket' | cut -d':' -f2 | sed 's/ //g') HOST_CPU_VENDOR=$(lscpu | grep -E 'Vendor' | cut -d':' -f2 | sed 's/ //g') From 1ccfd8246c12468e8e901802ed8a9e852d014b45 Mon Sep 17 00:00:00 2001 From: Basil K Y Date: Mon, 16 Oct 2023 15:23:46 +0530 Subject: [PATCH 06/31] fix ubuntu eol releases (#764) * fix ubuntu eol releases Signed-off-by: Basil K Y * fix hash check when using MD5 --------- Signed-off-by: Basil K Y --- quickget | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/quickget b/quickget index 7c655ed120..49ed246ac3 100755 --- a/quickget +++ b/quickget @@ -1774,11 +1774,11 @@ function get_ubuntu() { fi if wget -q --spider "${URL}/SHA256SUMS"; then - ISO=$(wget -q -O- "${URL}/SHA256SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | cut -d'*' -f2) - HASH=$(wget -q -O- "${URL}/SHA256SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso |cut -d' ' -f1) + ISO=$(wget -q -O- "${URL}/SHA256SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | grep -v "+mac" | cut -d'*' -f2 | sed '1q;d') + HASH=$(wget -q -O- "${URL}/SHA256SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | grep -v "+mac" | cut -d' ' -f1 | sed '1q;d') else - ISO=$(wget -q -O- "${URL}/MD5SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | cut -d' ' -f3) - HASH=$(wget -q -O- "${URL}/MD5SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | cut -d' ' -f1) + ISO=$(wget -q -O- "${URL}/MD5SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | grep -v "+mac" | cut -d'*' -f2) + HASH=$(wget -q -O- "${URL}/MD5SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | grep -v "+mac" | cut -d' ' -f1) fi if [[ "${RELEASE}" == *"daily"* ]] || [ "${RELEASE}" == "dvd" ]; then From 8f8a6a60b41e4e92728a660835d989752c550bd5 Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Mon, 16 Oct 2023 11:33:14 +0100 Subject: [PATCH 07/31] fix blendOS downloads again (#729) * fix blendOS downloads again * WIP tidy release/edition naming and consider showing YYMMDD date --- quickget | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/quickget b/quickget index 49ed246ac3..be72f4d3a6 100755 --- a/quickget +++ b/quickget @@ -283,15 +283,16 @@ function editions_arcolinux() { } function releases_blendos() { + +# Pull the rss feed +wget -q https://sourceforge.net/projects/blendos/rss?path=/ISOs/ -O- | grep -E -o 'https://.*blendOS\.iso.*/tmp/blendos-isos.rss + local RLIST - RLIST=$(curl -s https://api.github.com/repos/blend-os/blendOS/releases |grep tag_name | grep -o -E '[[:digit:]]+\.[[:digit:]]+' | tr ' \r\n' ' ') + RLIST=$(grep -E -o 'https://.*blendOS\.iso.*&1 | grep -i Location | cut -d' ' -f4) - URL=${TMPURL%\?*} - HASH=$(curl -s https://sourceforge.net/projects/blendos/files/${RELEASE}-1/${EDITION:-GNOME}/|grep -o -E '\"sha1\":\".*\"'|cut -d\" -f4) - ;; - kde|plasma) - local ED_DE="Plasma" - TMPURL=$(wget -q -S -O- --max-redirect=0 "https://sourceforge.net/projects/blendos/files/23.04-1/${ED_DE^}/blendOS-2023.04.22-x86_64-${ED_DE,,}.iso/download" 2>&1 | grep -i Location | cut -d' ' -f4) - URL=${TMPURL%\?*} - HASH=$(curl -s https://sourceforge.net/projects/blendos/files/${RELEASE}-1/Plasma/|grep -o -E '\"sha1\":\".*\"'|cut -d\" -f4) - ;; - esac - ;; - esac - echo "${URL} ${HASH}" + + # BlendOS has more editions and releases but there's a tracker indirect and other issues + # so easier to use the rss feed + # + # We have to provide edition/release as RELEASE or have a major refactor + # But this works for now ... or does it .... + URL=$(grep ${RELEASE} /tmp/blendos-isos.rss | grep -E -o 'https://.*blendOS\.iso') + HASH=$(grep ${RELEASE} /tmp/blendos-isos.rss | grep -E -o '[[:alnum:]]{32}') + # ## fix up variables for path naming + EDITION=${RELEASE%%/*} + RELEASE=${RELEASE##*/} + # For UX maybe show the date of the release + #echo ${RELEASE##*/} "(" $(date -d @${RELEASE##*/}) ")" + # maybe $(date -d @${RELEASE##*/} '+%Y%m%d') + echo "${URL} ${HASH}" } function get_vanillaos() { From 94f2aeb40db8c37fca496473abd0fb74580c1ec1 Mon Sep 17 00:00:00 2001 From: Shank Date: Mon, 17 Jul 2023 03:09:22 -0400 Subject: [PATCH 08/31] fix arcolinux releases --- quickget | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/quickget b/quickget index be72f4d3a6..1183a0a13f 100755 --- a/quickget +++ b/quickget @@ -275,7 +275,9 @@ function releases_archcraft() { } function releases_arcolinux() { - echo v21.09.11 v21.11.05 v22.01.10 + local RLIST + RLIST=$(curl -s https://ant.seedhost.eu/arcolinux/iso/ | grep -o -E ">v[[:digit:]]{2}.[[:digit:]]{2}.[[:digit:]]{2}" | sed -e "s/>//" | tr '\r\n' ' ') + echo ${RLIST} } function editions_arcolinux() { From 941b325269bc450a3f045166aecd1684053b50a4 Mon Sep 17 00:00:00 2001 From: Alejandro Date: Thu, 17 Aug 2023 01:14:40 +0200 Subject: [PATCH 09/31] Adjusted check values --- README.md | 4 ++-- docs/quickemu.1 | 4 ++-- docs/quickemu.1.md | 4 ++-- docs/quickget.1 | 2 +- docs/quickget.1.md | 2 +- quickemu | 4 ++-- quickget | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index a7db05a77c..cd1b72d162 100644 --- a/README.md +++ b/README.md @@ -477,7 +477,7 @@ quickemu --vm windows-11-22H2.conf - Complete the installation as you normally would. - All relevant drivers and services should be installed automatically. -- A local adminstrator user account is automatically created, with +- A local administrator user account is automatically created, with these credentials: - Username: `Quickemu` - Password: `quickemu` @@ -839,7 +839,7 @@ which Quickemu sizes to 2048x1152. Without the `--screen` option, Quickemu would have used the 1920x1080 monitor which results in a window size of 1664x936. -The '--screenpct' is an optional interger value between 25 \<= pct \< +The '--screenpct' is an optional integer value between 25 \<= pct \< 100 which will override system default screen sizes. The VM size will be 'pct' of the chosen screen. **If --fullscreen is chosen screen will be fullsize instead of being scaled down by --screenpct value.** diff --git a/docs/quickemu.1 b/docs/quickemu.1 index 4c20d6d2c9..963211b207 100644 --- a/docs/quickemu.1 +++ b/docs/quickemu.1 @@ -718,7 +718,7 @@ Complete the installation as you normally would. .IP \[bu] 2 All relevant drivers and services should be installed automatically. .IP \[bu] 2 -A local adminstrator user account is automatically created, with these +A local administrator user account is automatically created, with these credentials: .RS 2 .IP \[bu] 2 @@ -857,7 +857,7 @@ which Quickemu sizes to 2048x1152. Without the \f[V]--screen\f[R] option, Quickemu would have used the 1920x1080 monitor which results in a window size of 1664x936. .PP -The `\[en]screenpct' is an optional interger value between 25 <= pct < +The `\[en]screenpct' is an optional integer value between 25 <= pct < 100 which will override system default screen sizes. The VM size will be `pct' of the chosen screen. \f[B]If \[en]fullscreen is chosen screen will be fullsize instead of diff --git a/docs/quickemu.1.md b/docs/quickemu.1.md index 7de2871255..682bc95cd3 100644 --- a/docs/quickemu.1.md +++ b/docs/quickemu.1.md @@ -507,7 +507,7 @@ quickemu --vm windows-11-22H2.conf - Complete the installation as you normally would. - All relevant drivers and services should be installed automatically. -- A local adminstrator user account is automatically created, with +- A local administrator user account is automatically created, with these credentials: - Username: `Quickemu` - Password: `quickemu` @@ -624,7 +624,7 @@ which Quickemu sizes to 2048x1152. Without the `--screen` option, Quickemu would have used the 1920x1080 monitor which results in a window size of 1664x936. -The '--screenpct' is an optional interger value between 25 \<= pct \< +The '--screenpct' is an optional integer value between 25 \<= pct \< 100 which will override system default screen sizes. The VM size will be 'pct' of the chosen screen. **If --fullscreen is chosen screen will be fullsize instead of being scaled down by --screenpct value.** diff --git a/docs/quickget.1 b/docs/quickget.1 index 8bdbc1703c..20660ad75a 100644 --- a/docs/quickget.1 +++ b/docs/quickget.1 @@ -501,7 +501,7 @@ Complete the installation as you normally would. .IP \[bu] 2 All relevant drivers and services should be installed automatically. .IP \[bu] 2 -A local adminstrator user account is automatically created, with these +A local administrator user account is automatically created, with these credentials: .RS 2 .IP \[bu] 2 diff --git a/docs/quickget.1.md b/docs/quickget.1.md index 5bb5f223fb..b60a89f687 100644 --- a/docs/quickget.1.md +++ b/docs/quickget.1.md @@ -339,7 +339,7 @@ quickemu --vm windows-11-22H2.conf - Complete the installation as you normally would. - All relevant drivers and services should be installed automatically. -- A local adminstrator user account is automatically created, with +- A local administrator user account is automatically created, with these credentials: - Username: `Quickemu` - Password: `quickemu` diff --git a/quickemu b/quickemu index 638af8b038..4f3ef1b2fb 100755 --- a/quickemu +++ b/quickemu @@ -31,7 +31,7 @@ function ignore_msrs_alert() { echo echo " If you are unable to run macOS or Windows VMs then run the above 👆" echo " This will enable ignoring of unhandled MSRs until you reboot the host." - echo " You can make this change permenant by running: 'quickemu --ignore-msrs-always'" + echo " You can make this change permanent by running: 'quickemu --ignore-msrs-always'" fi fi } @@ -1013,7 +1013,7 @@ function vm_boot() { fi if [ "${network}" == "none" ]; then - # Disbale all networking + # Disable all networking echo " - Network: Disabled" args+=(-nic none) elif [ "${network}" == "restrict" ]; then diff --git a/quickget b/quickget index 1183a0a13f..5a95226093 100755 --- a/quickget +++ b/quickget @@ -925,7 +925,7 @@ EOF fi ;; vanillaos) - ## Minimum 50G for abroot + ## Minimum 64G for abroot echo "disk_size=\"64G\"" >> "${CONF_FILE}" ;; zorin) @@ -949,7 +949,7 @@ EOF esac if [ "${OS}" == "ubuntu" ] && [[ ${RELEASE} == *"daily"* ]]; then - # wont install lobster testing with less than 18GB + # won't install lobster testing with less than 32GB echo "disk_size=\"32G\"" >> "${CONF_FILE}" fi # Enable TPM for Windows 11 From af051339bae595623b8697f3db91fb33163242ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Criado-P=C3=A9rez?= Date: Tue, 29 Aug 2023 22:11:54 +0200 Subject: [PATCH 10/31] Explained headroom for memory limits --- quickget | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickget b/quickget index 5a95226093..ffe8a2d8c4 100755 --- a/quickget +++ b/quickget @@ -925,7 +925,7 @@ EOF fi ;; vanillaos) - ## Minimum 64G for abroot + ## Minimum is 50G for abroot, but a 64GB is allocated to give some headroom echo "disk_size=\"64G\"" >> "${CONF_FILE}" ;; zorin) @@ -949,7 +949,7 @@ EOF esac if [ "${OS}" == "ubuntu" ] && [[ ${RELEASE} == *"daily"* ]]; then - # won't install lobster testing with less than 32GB + # Minimum to install lobster testing is 18GB but 32GB are allocated for headroom echo "disk_size=\"32G\"" >> "${CONF_FILE}" fi # Enable TPM for Windows 11 From 392e74c16b36195b1e6eece7c051de00309ab6cd Mon Sep 17 00:00:00 2001 From: Jai A P Date: Mon, 16 Oct 2023 16:05:53 +0530 Subject: [PATCH 11/31] Updated manjaro fetching as migrated to new system (#742) * Updated manjaro fetching - Added sway release - Added choice to download minimal or full edition * Future proofing manjaro sway fetching * Forgot this kde -> plasma * Fix a typo * Update quickget --- quickget | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/quickget b/quickget index ffe8a2d8c4..53cf93723b 100755 --- a/quickget +++ b/quickget @@ -472,6 +472,10 @@ function editions_mxlinux(){ echo Xfce KDE Fluxbox } +function editions_manjaro(){ + echo full minimal +} + function releases_macos() { echo high-sierra mojave catalina big-sur monterey ventura } @@ -479,11 +483,12 @@ function releases_macos() { function releases_manjaro() { echo xfce \ gnome \ - kde \ + plasma \ budgie \ cinnamon \ i3 \ - mate + mate \ + sway } function releases_netboot() { @@ -1487,18 +1492,30 @@ function get_mageia() { } function get_manjaro() { + local EDITION="${1:-}" local HASH="" local ISO="" - local MANIFESTURL="" + local MANIFEST="" local URL="" + local TYPE="" case ${RELEASE} in - gnome|kde|xfce) MANIFESTURL="https://gitlab.manjaro.org/webpage/manjaro-homepage/-/raw/master/site/content/downloads/official/${RELEASE}.md";; - budgie|cinnamon|deepin|i3|mate) MANIFESTURL="https://gitlab.manjaro.org/webpage/manjaro-homepage/-/raw/master/site/content/downloads/community/${RELEASE}.md";; + sway) MANIFEST="$( wget -qO- https://mirror.manjaro-sway.download/manjaro-sway/release.json )";; + gnome|xfce|plasma) TYPE="official";; + *) TYPE="community";; esac - URL="$(wget -qO- "${MANIFESTURL}" | grep "Download_x64 =" | cut -d'"' -f2)" - HASH=$(wget -qO- "${MANIFESTURL}" | grep "Download_x64_Checksum =" | cut -d'"' -f2) + [[ ${RELEASE} != "sway" ]] && MANIFEST="$(wget -qO- https://gitlab.manjaro.org/web/iso-info/-/raw/master/file-info.json)" + + [[ ${EDITION} == "minimal" && ${TYPE} != "sway" ]] && EDITION=".minimal" || EDITION="" + + if [[ ${RELEASE} != "sway" ]]; then + URL="$(echo ${MANIFEST} | jq -r .${TYPE}.${RELEASE}${EDITION}.image)" + else + URL=$(echo ${MANIFEST} | jq -r '.[] | select(.name|test("^manjaro-sway-.*[.]iso$")) | select(.name|contains("unstable")|not) | .url') + fi + + HASH=$(wget -qO- "${URL}.sha512" | cut -d' ' -f1) echo "${URL} ${HASH}" } @@ -2289,6 +2306,15 @@ if [ -n "${2}" ]; then fi fi + # Handle missing Mangaro Sway minimal + if [[ $OS == manjaro ]] ; then + if [[ ${RELEASE} == "sway" && ${EDITION} == "minimal" ]] ; then + echo "ERROR! Unsupported combination" + echo " Manjaro Sway does not have a minimal edition" + exit 1; + fi + fi + VM_PATH="${OS}-${RELEASE}-${EDITION}" validate_release "releases_${OS}" From 6eeb3db45c5b3c1c191ad3fc53d6321dce1bcfa0 Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Mon, 16 Oct 2023 11:36:31 +0100 Subject: [PATCH 12/31] Improve test for presence of smbd (#754) Will now work with nix / nixOS Co-authored-by: omernaveedxyz --- quickemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickemu b/quickemu index 4f3ef1b2fb..69c0c25591 100755 --- a/quickemu +++ b/quickemu @@ -886,7 +886,7 @@ function vm_boot() { fi # If smbd is available and ~/Public is present export it to the guest via samba - if [[ -e "/usr/sbin/smbd" && -n ${PUBLIC} ]]; then + if [[ -x "$(command -v smbd)" && -n ${PUBLIC} ]]; then NET="${NET},smb=${PUBLIC}" echo " - smbd: On guest: smb://10.0.2.4/qemu" fi From e2e857030a85fa3abe777a12f3bd4da1fa8e8334 Mon Sep 17 00:00:00 2001 From: zenobit Date: Wed, 13 Sep 2023 21:39:45 +0200 Subject: [PATCH 13/31] siduction: 2023 1.1 --- quickget | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickget b/quickget index 53cf93723b..ef273ad9ba 100755 --- a/quickget +++ b/quickget @@ -1656,10 +1656,10 @@ function get_siduction() { local HASH="" local DATE="" local ISO="" - local URL="https://mirrors.dotsrc.org/siduction/iso/Masters_of_War/${EDITION}" + local URL="https://mirrors.dotsrc.org/siduction/iso/Standing_on_the_Shoulders_of_Giants/${EDITION}" DATE=$(wget -q -O- "${URL}"| grep .iso.md5 | cut -d'-' -f6 | cut -d'.' -f1) HASH=$(wget -q -O- "${URL}/${ISO}.md5" | cut -d' ' -f1) - ISO="siduction-22.1.1-Masters_of_War-${EDITION}-amd64-${DATE}.iso" + ISO="siduction-2023.1.1-Standing_on_the_Shoulders_of_Giants-${EDITION}-amd64-${DATE}.iso" echo "${URL}/${ISO} ${HASH}" } From 1586042e34f0bb6ba53190148d010bb6bd615c2a Mon Sep 17 00:00:00 2001 From: Chase Covello Date: Fri, 28 Apr 2023 15:15:49 -0700 Subject: [PATCH 14/31] Added support for changing virtual sound hardware Added new configuration file option "sound_card" and new command-line switch "--sound-card" to change the virtual sound hardware. Allowed options are "intel-hda" (default), "ac97", "es1370", "sb16", and "none". Also changed default sound card for Solaris to "ac97" and for FreeDOS to "sb16". --- quickemu | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/quickemu b/quickemu index 69c0c25591..6a696fcf5a 100755 --- a/quickemu +++ b/quickemu @@ -235,6 +235,7 @@ function vm_boot() { local MAC_DISK_DEV="${MAC_DISK_DEV:-ide-hd,bus=ahci.2}" local NET_DEVICE="${NET_DEVICE:-virtio-net}" local OSK="" + local SOUND="" local SMM="${SMM:-off}" local USB_HOST_PASSTHROUGH_CONTROLLER="qemu-xhci" local VGA="" @@ -487,11 +488,13 @@ function vm_boot() { if [ "${guest_os}" == "freedos" ] ; then # fix for #382 SMM="on" + SOUND_CARD="sb16" fi if [[ "${guest_os}" == *"solaris" ]]; then MACHINE_TYPE="pc" USB_CONTROLLER="xhci" + SOUND_CARD="ac97" fi if [ -z "${disk_size}" ]; then @@ -792,6 +795,16 @@ function vm_boot() { # Add fullscreen options VIDEO="${VGA} ${VIDEO} ${FULLSCREEN}" + # Build the sound hardware configuration + if [ "${SOUND_CARD}" == "intel-hda" ]; then + SOUND="-device intel-hda -device hda-duplex,audiodev=audio0" + elif [ "${SOUND_CARD}" == "ac97" ] || [ "${SOUND_CARD}" == "es1370" ] || [ "${SOUND_CARD}" == "sb16" ]; then + SOUND="-device ${SOUND_CARD},audiodev=audio0" + elif [ "${SOUND_CARD}" == "none" ]; then + SOUND="" + fi + echo " - Sound: ${SOUND_CARD}" + # Set the hostname of the VM local NET="user,hostname=${VMNAME}" @@ -920,7 +933,7 @@ function vm_boot() { -m ${RAM_VM} ${BALLOON} ${VIDEO} -display ${DISPLAY_RENDER} -audiodev ${AUDIO_DEV} - -device intel-hda -device hda-duplex,audiodev=audio0 + ${SOUND} -rtc base=localtime,clock=host,driftfix=slew) # Only enable SPICE is using SPICE display @@ -1330,7 +1343,7 @@ function usage() { echo " --viewer : Choose an alternative viewer. @Options: 'spicy' (default), 'remote-viewer', 'none'" echo " --ssh-port : Set ssh-port manually" echo " --spice-port : Set spice-port manually" - echo " --public-dir : expose share directory. @Options: '' (default: xdg-user-dir PUBLICSHARE), '', 'none'" + echo " --public-dir : Expose share directory. @Options: '' (default: xdg-user-dir PUBLICSHARE), '', 'none'" echo " --monitor : Set monitor connection type. @Options: 'socket' (default), 'telnet', 'none'" echo " --monitor-telnet-host : Set telnet host for monitor. (default: 'localhost')" echo " --monitor-telnet-port : Set telnet port for monitor. (default: '4440')" @@ -1342,6 +1355,7 @@ function usage() { echo " --keyboard_layout : Set keyboard layout." echo " --mouse : Set mouse. @Options: 'tablet' (default), 'ps2', 'usb', 'virtio'" echo " --usb-controller : Set usb-controller. @Options: 'ehci' (default), 'xhci', 'none'" + echo " --sound-card : Set sound card. @Options: 'intel-hda' (default), 'ac97', 'es1370', 'sb16', 'none'" echo " --extra_args : Pass additional arguments to qemu" echo " --version : Print version" exit 1 @@ -1354,6 +1368,13 @@ function display_param_check() { fi } +function sound_card_param_check() { + if [ "${SOUND_CARD}" != "intel-hda" ] && [ "${SOUND_CARD}" != "ac97" ] && [ "${SOUND_CARD}" != "es1370" ] && [ "${SOUND_CARD}" != "sb16" ] && [ "${SOUND_CARD}" != "none" ]; then + echo "ERROR! Requested sound card '${SOUND_CARD}' is not recognised." + exit 1 + fi +} + function viewer_param_check() { if [ "${VIEWER}" != "none" ] && [ "${VIEWER}" != "spicy" ] && [ "${VIEWER}" != "remote-viewer" ]; then echo "ERROR! Requested viewer '${VIEWER}' is not recognised." @@ -1474,6 +1495,8 @@ keyboard="usb" keyboard_layout="en-us" # options: ps2, usb, tablet, virtio mouse="tablet" +# options: intel-hda, ac97, es1370, sb16, none +sound_card="intel-hda" BRAILLE="" DELETE_DISK=0 @@ -1512,6 +1535,7 @@ KEYBOARD_LAYOUT="" MOUSE="" USB_CONTROLLER="" EXTRA_ARGS="" +SOUND_CARD="" # shellcheck disable=SC2155 readonly LAUNCHER=$(basename "${0}") @@ -1665,6 +1689,10 @@ else EXTRA_ARGS="${2}" shift; shift;; + -sound-card|--sound-card) + SOUND_CARD="${2}" + shift; + shift;; -version|--version) echo "${VERSION}" exit;; @@ -1767,6 +1795,11 @@ if [ -n "${VM}" ] && [ -e "${VM}" ]; then exit 1 fi + if [ -z "${SOUND_CARD}" ]; then + SOUND_CARD="${sound_card}" + fi + sound_card_param_check + # Check if vm is already run VM_PID=0 VM_UP=0 From 44cab4e971386f8f4d15f7cc5055f4042b9e3278 Mon Sep 17 00:00:00 2001 From: zenobit Date: Wed, 13 Sep 2023 21:43:19 +0200 Subject: [PATCH 15/31] vx-linux: 5.5 --- quickget | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/quickget b/quickget index ef273ad9ba..b92ceb5287 100755 --- a/quickget +++ b/quickget @@ -699,7 +699,7 @@ function editions_void() { } function releases_vxlinux() { - echo 6.1.2 6.1 5.0 4.2 4.1 4.0 + wget -q https://github.com/VX-Linux/main/releases/latest -O- |grep -o -e 'releases/tag/[[:digit:]]\+\.[[:digit:]]\+'|head -1|cut -d/ -f3 } function releases_windows() { @@ -1822,6 +1822,14 @@ function get_void() { echo "${URL}/${ISO} ${HASH}" } +function get_vxlinux() { + local HASH="" + local ISO="vx-${RELEASE}.iso" + local URL="https://github.com/VX-Linux/main/releases/download/${RELEASE}" + + HASH=$(wget -q -O- "${URL}/vx-${RELEASE}.md5" | cut -d' ' -f1) + echo "${URL}/${ISO} ${HASH}" +} function get_xerolinux() { local HASH="" @@ -1844,19 +1852,6 @@ function get_zorin() { echo "${URL} ${HASH}" } -function get_vxlinux() { - local HASH="" - local ISO="" - local URL="https://github.com/dessington/vx-linux/releases/download/${RELEASE}" - - if [ "$RELEASE" == "4.0" ]; then - ISO="vx-linux-4.0-qt.iso" - else - ISO="vx-linux-${RELEASE}.iso" - fi - echo "${URL}/${ISO} ${HASH}" -} - function unattended_windows() { cat << 'EOF' > "${1}" From d5798eeb01079dda1b2dd231783bff8d96c745af Mon Sep 17 00:00:00 2001 From: zenobit Date: Mon, 16 Oct 2023 12:44:25 +0200 Subject: [PATCH 16/31] holoiso: 20230626 (#746) * holoiso update * change position in script no code change * remove unused DATE --- quickget | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/quickget b/quickget index b92ceb5287..2262c3d800 100755 --- a/quickget +++ b/quickget @@ -47,6 +47,7 @@ function pretty_name() { freedos) PRETTY_NAME="FreeDOS";; garuda) PRETTY_NAME="Garuda Linux";; ghostbsd) PRETTY_NAME="GhostBSD";; + holoiso) PRETTY_NAME="HoloISO";; kdeneon) PRETTY_NAME="KDE Neon";; kolibrios) PRETTY_NAME="KolibriOS";; linuxmint) PRETTY_NAME="Linux Mint";; @@ -65,7 +66,6 @@ function pretty_name() { reactos) PRETTY_NAME="ReactOS";; rebornos) PRETTY_NAME="RebornOS";; rockylinux) PRETTY_NAME="Rocky Linux";; - holoiso) PRETTY_NAME="HoloISO";; truenas-core) PRETTY_NAME="TrueNAS Core";; truenas-scale) PRETTY_NAME="TrueNAS Scale";; ubuntu-budgie) PRETTY_NAME="Ubuntu Budgie";; @@ -200,6 +200,7 @@ function os_support() { gentoo \ ghostbsd \ haiku \ + holoiso \ kali \ kdeneon \ kolibrios \ @@ -225,7 +226,6 @@ function os_support() { siduction \ slackware \ solus \ - holoiso \ tails \ truenas-core \ truenas-scale \ @@ -428,6 +428,10 @@ function editions_haiku() { echo x86_64 x86_gcc2h } +function releases_holoiso() { + echo 4.5 +} + function releases_kali() { echo current kali-weekly } @@ -579,10 +583,6 @@ function editions_solus() { echo Budgie GNOME MATE Plasma } -function releases_holoiso() { - echo 4.0 -} - function releases_tails() { echo stable } @@ -1349,6 +1349,15 @@ function get_haiku() { echo "${URL}/${ISO} ${HASH}" } +function get_holoiso() { + local HASH="" + local ISO="HoloISO_${RELEASE}_ux_changes-20230626_66f7c74061_bootchoice_fixes-1-x86_64.iso" + local URL="http://holoiso.itsvixano.me" + + HASH=$(wget -q -O- "${URL}/${ISO}.sha256sum" | cut -d' ' -f1) + echo "${URL}/${ISO} ${HASH}" +} + function get_kali() { local HASH="" local ISO="" @@ -1681,16 +1690,6 @@ function get_solus() { echo "${URL}/${ISO} ${HASH}" } -function get_holoiso() { - local HASH="" - local DATE="20221211" - local ISO="HoloISO_${RELEASE}_OfflineInstaller-${DATE}_1636-x86_64.iso" - local URL="http://holoiso.itsvixano.me" - - HASH=$(wget -q -O- "${URL}/${ISO}.sha256sum" | cut -d' ' -f1) - echo "${URL}/${ISO} ${HASH}" -} - function get_tails() { local ISO="" local JSON="" From 787253b2aa8ad27dfd4d387aeba887fb09dec601 Mon Sep 17 00:00:00 2001 From: zenobit Date: Mon, 16 Oct 2023 12:45:25 +0200 Subject: [PATCH 17/31] garuda: fix (#759) * garuda: update mirror and editions * disc_size 32GB --- quickget | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/quickget b/quickget index 2262c3d800..080beaf385 100755 --- a/quickget +++ b/quickget @@ -400,12 +400,11 @@ function releases_freedos() { } function releases_garuda() { - echo latest + echo latest } function editions_garuda() { - URL="https://mirrors.fossho.st/garuda/iso/latest/garuda/" - echo $(wget -q -O - ${URL} | grep '^> "${CONF_FILE}";; openindiana) echo "boot=\"legacy\"" >> "${CONF_FILE}" @@ -1305,7 +1304,7 @@ function get_garuda() { local EDITION="${1:-}" local HASH="" local ISO="" - local URL="https://mirrors.fossho.st/garuda/iso/latest/garuda/" + local URL="https://iso.builds.garudalinux.org/iso/latest/garuda" ISO=${EDITION}/latest.iso From 21a25d4740c5d148f218130df5f10d4553617c51 Mon Sep 17 00:00:00 2001 From: Basil K Y Date: Sat, 16 Sep 2023 18:03:05 +0530 Subject: [PATCH 18/31] added linux mint 21.2 Signed-off-by: Basil K Y --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index 080beaf385..0680b935e3 100755 --- a/quickget +++ b/quickget @@ -444,7 +444,7 @@ function releases_kolibrios() { } function releases_linuxmint(){ - echo 20.2 20.3 21 21.1 + echo 20.2 20.3 21 21.1 21.2 } function editions_linuxmint(){ From 6ba173e85bfa289c9e1dc2bace6f01ccdf8a059d Mon Sep 17 00:00:00 2001 From: Basil K Y Date: Sat, 16 Sep 2023 18:20:16 +0530 Subject: [PATCH 19/31] fix cachyos Signed-off-by: Basil K Y --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index 0680b935e3..b7e43fa9d2 100755 --- a/quickget +++ b/quickget @@ -297,7 +297,7 @@ wget -q https://sourceforge.net/projects/blendos/rss?path=/ISOs/ -O- | grep -E - function releases_cachyos() { - echo 2300305 + echo 230813 } function editions_cachyos() { From 3288be8d06ae7fd80e864fd4fb85a9ed845a119b Mon Sep 17 00:00:00 2001 From: Neinei0k Date: Sun, 17 Sep 2023 01:30:21 +0300 Subject: [PATCH 20/31] Fix Gentoo hash check in quickget Gentoo DIGESTS file contains BLAKE2B and SHA512 hashes. Since BLAKE2B comes first in the file, it was incorrectly selected when checking SHA512 checksum. --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index b7e43fa9d2..22a53dbb26 100755 --- a/quickget +++ b/quickget @@ -1318,7 +1318,7 @@ function get_gentoo() { local URL="https://mirror.bytemark.co.uk/gentoo/releases/amd64/autobuilds/" ISO=$(wget -q -O- "${URL}/${RELEASE}-iso.txt" | grep install | cut -d' ' -f1) - HASH=$( wget -q -O- "${URL}/${ISO}.DIGESTS" | grep iso | grep -v CONTENTS | cut -d' ' -f1) + HASH=$( wget -q -O- "${URL}/${ISO}.DIGESTS" | grep -A 1 SHA512 | grep iso | grep -v CONTENTS | cut -d' ' -f1) echo "${URL}/${ISO} ${HASH}" } From 50f63f94d8bb71fbb2517ef364e5cc3c218a1896 Mon Sep 17 00:00:00 2001 From: zenobit Date: Sat, 30 Sep 2023 06:50:02 +0200 Subject: [PATCH 21/31] repair alma linux old iso deprecated added boot iso changed mirror to official almalinux.org versions 8 and 9 will download latest release --- quickget | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/quickget b/quickget index 22a53dbb26..d45cf003d6 100755 --- a/quickget +++ b/quickget @@ -247,11 +247,11 @@ function os_support() { } function releases_alma() { - echo 8.6 8.7 9.0 9.1 + echo 8 9 } function editions_alma() { - echo minimal dvd + echo boot minimal dvd } function releases_alpine() { @@ -978,8 +978,8 @@ EOF function get_alma() { local EDITION="${1:-}" local HASH="" - local ISO="AlmaLinux-${RELEASE}-x86_64-${EDITION}.iso" - local URL="https://mirror.rackspace.com/almalinux/${RELEASE/beta-1/beta}/isos/x86_64/" + local ISO="AlmaLinux-${RELEASE}-latest-x86_64-${EDITION}.iso" + local URL="https://repo.almalinux.org/almalinux/${RELEASE}/isos/x86_64" HASH="$(wget -q -O- "${URL}/CHECKSUM" | grep "(${ISO}" | cut -d' ' -f4)" echo "${URL}/${ISO} ${HASH}" } From b4d7c90b890324558f9bcf1368053ea829683c75 Mon Sep 17 00:00:00 2001 From: zenobit Date: Sun, 1 Oct 2023 18:34:29 +0200 Subject: [PATCH 22/31] repair NetBSD releases grep: warning: stray \ before " --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index d45cf003d6..0500e14be5 100755 --- a/quickget +++ b/quickget @@ -499,7 +499,7 @@ function releases_netboot() { } function releases_netbsd() { - local NBSD_RELEASES=$(curl -sL http://cdn.netbsd.org/pub/NetBSD/iso/ | grep -o -E '\"[[:digit:]]+\.[[:digit:]]+/\"' |tr -d '"/' |sort -nr ) + local NBSD_RELEASES=$(curl -sL http://cdn.netbsd.org/pub/NetBSD/iso/ | grep -o -E '"[[:digit:]]+\.[[:digit:]]+/"' |tr -d '"/' |sort -nr ) echo ${NBSD_RELEASES} } From 302cccab39ac8f2d613dcf25fd1ab99eae454f61 Mon Sep 17 00:00:00 2001 From: zenobit Date: Sun, 1 Oct 2023 19:47:29 +0200 Subject: [PATCH 23/31] repair DragonFlyBSD releases --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index 0500e14be5..b72d875ae5 100755 --- a/quickget +++ b/quickget @@ -334,7 +334,7 @@ function releases_devuan() { function releases_dragonflybsd() { # If you remove "".bz2" from the end of the searched URL, you will get only the current release - currently 6.4.0 # We could add a variable so this behaviour is optional/switchable (maybe from option or env) - DBSD_RELEASES=$(curl -sL http://mirror-master.dragonflybsd.org/iso-images/| grep -E -o '\"dfly-x86_64-.*_REL.iso.bz2\"' | grep -o -E '[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+' ) + DBSD_RELEASES=$(curl -sL http://mirror-master.dragonflybsd.org/iso-images/| grep -E -o '"dfly-x86_64-.*_REL.iso.bz2"' | grep -o -E '[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+' ) echo $DBSD_RELEASES } From 5d216914b8170d8874af04751e8f9ee74a2a5575 Mon Sep 17 00:00:00 2001 From: Basil K Y Date: Sun, 8 Oct 2023 15:58:01 +0530 Subject: [PATCH 24/31] update alpine linux releases --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index b72d875ae5..182d03f22c 100755 --- a/quickget +++ b/quickget @@ -255,7 +255,7 @@ function editions_alma() { } function releases_alpine() { - echo 3.12 3.13 3.14 3.15 latest + echo 3.12 3.13 3.14 3.15 3.16 3.17 3.18 latest } function releases_android() { From 2574113fa1bcf9d18df60536a11948a8f1ca97cd Mon Sep 17 00:00:00 2001 From: Basil K Y Date: Sun, 8 Oct 2023 16:04:52 +0530 Subject: [PATCH 25/31] update devuan release --- quickget | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/quickget b/quickget index 182d03f22c..4dee8de739 100755 --- a/quickget +++ b/quickget @@ -328,7 +328,7 @@ function releases_deepin() { } function releases_devuan() { - echo beowulf chimaera + echo beowulf chimaera daedalus } function releases_dragonflybsd() { @@ -1185,6 +1185,7 @@ function get_devuan() { case ${RELEASE} in beowulf) ISO="devuan_${RELEASE}_3.1.1_amd64_desktop-live.iso";; chimaera) ISO="devuan_${RELEASE}_4.0.2_amd64_desktop-live.iso";; + daedalus) ISO="devuan_${RELEASE}_5.0.0_amd64_desktop-live.iso";; esac HASH=$(wget -q -O- "${URL}/SHASUMS.txt" | grep "${ISO}" | cut -d' ' -f1) echo "${URL}/${ISO} ${HASH}" From 05c7511b2fd30f79bd429c2961845d4001ada79f Mon Sep 17 00:00:00 2001 From: SoulHarsh007 Date: Fri, 13 Oct 2023 14:39:35 +0530 Subject: [PATCH 26/31] fix(rebornos): use CDN metadata API instead of scraping Signed-off-by: SoulHarsh007 --- quickget | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quickget b/quickget index 4dee8de739..b1e4216293 100755 --- a/quickget +++ b/quickget @@ -549,9 +549,9 @@ function releases_rebornos() { } function get_rebornos() { - local ISO=$(curl -s 'https://www.rebornos.org/download/' | grep -ohE 'https://pub-cb7a4d4f7a974896b3bf40c52d1defbc.r2.dev/RebornOS-ISO/(rebornos_xfce_minimal|rebornos_iso)-[0-9]{4}.[0-9]{2}.[0-9]{2}-x86_64.iso' | tail -n1) - local HASH=$(curl -s 'https://www.rebornos.org/download/' | grep -ozP 'Checksum MD5:.*[0-9a-fA-F]{32}' | grep -zoP '[0-9a-fA-F]{32}' | cut -d '' -f1) - echo "${ISO} ${HASH}" + local ISO=$(wget -q -O- "https://meta.cdn.soulharsh007.dev/RebornOS-ISO?format=json" | jq -r ".url") + local HASH=$(wget -q -O- "https://meta.cdn.soulharsh007.dev/RebornOS-ISO?format=json" | jq -r ".md5") + echo "${ISO} ${HASH}" } function releases_rockylinux() { From b816a4aa89168465f840352a5cea574db3b8947e Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Mon, 16 Oct 2023 12:09:56 +0100 Subject: [PATCH 27/31] feat: add support for ubuntu 23.10 --- quickget | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickget b/quickget index b1e4216293..2bf66e1682 100755 --- a/quickget +++ b/quickget @@ -603,7 +603,7 @@ function releases_truenas-scale() { function releases_ubuntu() { local LTS_SUPPORT="14.04 16.04 18.04 20.04 22.04" - local INTERIM_SUPPORT="23.04" + local INTERIM_SUPPORT="23.04 23.10" case "${OS}" in kubuntu|lubuntu|ubuntukylin|\ @@ -679,7 +679,7 @@ function releases_ubuntu() { function releases_ubuntu-server() { local LTS_SUPPORT="18.04 20.04 22.04" - local INTERIM_SUPPORT="23.04" + local INTERIM_SUPPORT="23.04 23.10" echo ${LTS_SUPPORT} \ ${INTERIM_SUPPORT} \ daily-live From 3665309a88ab3f4a8dfa90059be1199b1a9da389 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Mon, 16 Oct 2023 12:23:02 +0100 Subject: [PATCH 28/31] feat: add edubuntu support, fixes #711 closes #757 --- quickget | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/quickget b/quickget index 2bf66e1682..16b44aae3c 100755 --- a/quickget +++ b/quickget @@ -606,6 +606,9 @@ function releases_ubuntu() { local INTERIM_SUPPORT="23.04 23.10" case "${OS}" in + edubuntu) + INTERIM_SUPPORT="${INTERIM_SUPPORT}" + ;; kubuntu|lubuntu|ubuntukylin|\ ubuntu-mate|ubuntustudio|xubuntu) ## after 14.04 @@ -624,12 +627,11 @@ function releases_ubuntu() { esac - if [ "${OS}" == "ubuntu-unity" ] || [ "${OS}" == "ubuntucinnamon" ]; then + if [ "${OS}" == "edubuntu" ] || [ "${OS}" == "ubuntu-unity" ] || [ "${OS}" == "ubuntucinnamon" ]; then echo ${INTERIM_SUPPORT} \ daily-live \ daily-canary \ ; - else echo ${LTS_SUPPORT} \ ${INTERIM_SUPPORT} \ From b3846a549a3118e99abf57b84b8afa105f3c0daf Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 12 Oct 2023 20:44:56 +0200 Subject: [PATCH 29/31] Add PeppermintOS --- quickget | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/quickget b/quickget index 16b44aae3c..bd57ee15ea 100755 --- a/quickget +++ b/quickget @@ -62,6 +62,7 @@ function pretty_name() { openindiana) PRETTY_NAME="OpenIndiana";; opensuse) PRETTY_NAME="openSUSE";; oraclelinux) PRETTY_NAME="Oracle Linux";; + peppermint) PRETTY_NAME="PeppermintOS";; popos) PRETTY_NAME="Pop!_OS";; reactos) PRETTY_NAME="ReactOS";; rebornos) PRETTY_NAME="RebornOS";; @@ -219,6 +220,7 @@ function os_support() { openindiana \ opensuse \ oraclelinux \ + peppermint \ popos \ reactos \ rebornos \ @@ -532,6 +534,14 @@ function releases_oraclelinux() { echo 7.7 7.8 7.9 8.4 8.5 8.6 9.0 } +function releases_peppermint() { + echo latest +} + +function editions_peppermint() { + echo devuan-xfce devuan-gnome debian-xfce debian-gnome +} + function releases_popos() { echo 20.04 21.10 22.04 } @@ -1624,6 +1634,31 @@ function get_oraclelinux() { echo "${URL}/${ISO} ${HASH}" } +function get_peppermint() { + local EDITION="${1:-}" + local HASH="" + local ISO="" + local URL="https://sourceforge.net/projects/peppermintos/files/isos" + + case ${EDITION} in + devuan-xfce) ISO="PeppermintOS-devuan_64_xfce.iso" + URL="${URL}/XFCE" + ;; + debian-xfce) ISO="PeppermintOS-Debian-64.iso" + URL="${URL}/XFCE" + ;; + devuan-gnome) ISO="PeppermintOS-devuan_64_gfb.iso" + URL="${URL}/Gnome_FlashBack" + ;; + debian-gnome) ISO="PeppermintOS-Debian_64_gfb.iso" + URL="${URL}/Gnome_FlashBack" + ;; + esac + + HASH=$(wget -q -O- "${URL}/${ISO}-sha512.checksum" | grep "${ISO}" | cut -d' ' -f1) + echo "${URL}/${ISO} ${HASH}" +} + function get_popos() { local EDITION="${1:-}" local HASH="" From 834be37c86142c918b42107558742701df7e4b9b Mon Sep 17 00:00:00 2001 From: zenobit Date: Sun, 17 Sep 2023 18:34:13 +0200 Subject: [PATCH 30/31] Add Trisquel GNU Linux --- quickget | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/quickget b/quickget index bd57ee15ea..cba3ef8460 100755 --- a/quickget +++ b/quickget @@ -229,6 +229,7 @@ function os_support() { slackware \ solus \ tails \ + trisquel \ truenas-core \ truenas-scale \ ubuntu \ @@ -596,6 +597,14 @@ function releases_tails() { echo stable } +function releases_trisquel() { + echo 10.0.1 11.0 +} + +function editions_trisquel() { + echo mate lxde kde sugar +} + function releases_truenas() { if [[ $OS == truenas ]] ; then echo "ERROR! The supported TrueNAS OS values are truenas-core or truenas-scale" @@ -1739,6 +1748,22 @@ function get_tails() { echo "${URL} ${HASH}" } +function get_trisquel() { + local EDITION="${1:-}" + local HASH="" + local ISO="" + local URL="https://mirrors.ocf.berkeley.edu/trisquel-images" + + case ${EDITION} in + mate) ISO="trisquel_${RELEASE}_amd64.iso";; + lxde) ISO="trisquel-mini_${RELEASE}_amd64.iso";; + kde) ISO="triskel_${RELEASE}_amd64.iso";; + sugar) ISO="trisquel-sugar_${RELEASE}_amd64.iso";; + esac + HASH=$(wget -q -O- "${URL}/${ISO}.sha1" | grep "${ISO}" | cut -d' ' -f1) + echo "${URL}/${ISO} ${HASH}" +} + function get_truenas-scale() { local ISO="" local URL="" From 49067525199e414ae9190aaa07fade3c5f44e491 Mon Sep 17 00:00:00 2001 From: zenobit Date: Fri, 6 Oct 2023 22:50:44 +0200 Subject: [PATCH 31/31] Add bunsenlabs --- quickget | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/quickget b/quickget index cba3ef8460..3b72944a09 100755 --- a/quickget +++ b/quickget @@ -185,6 +185,7 @@ function os_support() { arcolinux \ batocera \ blendos \ + bunsenlabs \ cachyos \ centos-stream \ debian \ @@ -299,6 +300,10 @@ wget -q https://sourceforge.net/projects/blendos/rss?path=/ISOs/ -O- | grep -E - } +function releases_bunsenlabs() { + echo latest +} + function releases_cachyos() { echo 230813 } @@ -1071,6 +1076,14 @@ function get_arcolinux() { echo "${URL}/${ISO} ${HASH}" } +function get_bunsenlabs() { + local HASH="" + local ISO="beryllium-1-amd64.hybrid.iso" + local URL="https://ddl.bunsenlabs.org/ddl" + HASH=$(wget -q -O- "${URL}/release.sha256.txt" | head -1 | cut -d' ' -f1) + echo "${URL}/${ISO} ${HASH}" +} + function get_blendos() { local HASH=""