From 19d62c45f2b75af3631e146f25b8525e7decb193 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 23 Feb 2022 11:18:41 +0000 Subject: [PATCH 1/7] Add editions to FreeBSD to support disc1 and dvd1. Closes #383 --- quickget | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/quickget b/quickget index b18e702..f3f6ae2 100755 --- a/quickget +++ b/quickget @@ -274,6 +274,10 @@ function releases_freebsd(){ echo 12.2 12.3 13.0 } +function editions_freebsd(){ + echo disc1 dvd1 +} + function releases_garuda() { echo 220131 } From a2db7348a0c6181bc4726aea31403995a4992b27 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 23 Feb 2022 11:32:55 +0000 Subject: [PATCH 2/7] Add Debian netinst to the editions. Closes #381 --- quickget | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/quickget b/quickget index f3f6ae2..f380ac7 100755 --- a/quickget +++ b/quickget @@ -242,7 +242,7 @@ function releases_debian() { } function editions_debian() { - echo standard cinnamon gnome kde lxde lxqt mate xfce + echo standard cinnamon gnome kde lxde lxqt mate xfce netinst } function releases_devuan() { @@ -757,6 +757,12 @@ function get_debian() { 11.2.0) URL="https://cdimage.debian.org/debian-cd/${RELEASE}-live/amd64/iso-hybrid";; *) URL="https://cdimage.debian.org/cdimage/archive/${RELEASE}-live/amd64/iso-hybrid/";; esac + + if [ "${EDITION}" == "netinst" ]; then + URL="$(echo "${URL}" | sed 's/-live//' | sed 's/hybrid/cd/')" + ISO="$(echo "${ISO}" | sed 's/-live//')" + fi + HASH=$(wget -q -O- "${URL}/SHA512SUMS" | grep "${ISO}" | cut -d' ' -f1) echo "${URL}/${ISO} ${HASH}" } From 86f3d46802c5c82ea815240575ee4f57bc9d1ba6 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 23 Feb 2022 11:36:41 +0000 Subject: [PATCH 3/7] Use correct Slackware naming. Closes #380 --- quickget | 1 - 1 file changed, 1 deletion(-) diff --git a/quickget b/quickget index f380ac7..63a2ac9 100755 --- a/quickget +++ b/quickget @@ -54,7 +54,6 @@ function pretty_name() { popos) PRETTY_NAME="Pop!_OS";; regolith) PRETTY_NAME="Regolith Linux";; rockylinux) PRETTY_NAME="Rocky Linux";; - slackware) PRETTY_NAME="Slackware Linux";; ubuntu-budgie) PRETTY_NAME="Ubuntu Budgie";; ubuntu-kylin) PRETTY_NAME="Ubuntu Kylin";; ubuntu-mate) PRETTY_NAME="Ubuntu MATE";; From 4f201949cd8130ea5ac7082073a4128eb907078d Mon Sep 17 00:00:00 2001 From: nqvrg <66185596+nqvrg@users.noreply.github.com> Date: Wed, 23 Feb 2022 12:39:11 +0100 Subject: [PATCH 4/7] Add support for DragonFlyBSD (#378) * Add support for DragonFlyBSD * Add DragonFlyBSD to README --- README.md | 1 + quickget | 24 +++++++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e09466a..03b17a4 100644 --- a/README.md +++ b/README.md @@ -215,6 +215,7 @@ Other Operating Systems - `cachyos` (CachyOS) - `debian` (Debian) - `devuan` (Devuan) + `dragonflybsd` (DragonFlyBSD) - `elementary` (elementary OS) - `fedora` (Fedora) - `freebsd` (FreeBSD) diff --git a/quickget b/quickget index 63a2ac9..a26fe90 100755 --- a/quickget +++ b/quickget @@ -36,6 +36,7 @@ function pretty_name() { archlinux) PRETTY_NAME="Arch Linux";; arcolinux) PRETTY_NAME="Arco Linux";; cachyos) PRETTY_NAME="CachyOS";; + dragonflybsd) PRETTY_NAME="DragonFlyBSD";; elementary) PRETTY_NAME="elementary OS";; freebsd) PRETTY_NAME="FreeBSD";; garuda) PRETTY_NAME="Garuda Linux";; @@ -161,6 +162,7 @@ function os_support() { cachyos \ debian \ devuan \ + dragonflybsd \ elementary \ fedora \ freebsd \ @@ -248,6 +250,10 @@ function releases_devuan() { echo beowulf chimaera } +function releases_dragonflybsd() { + echo 6.2.1 +} + function releases_elementary() { echo 6.1 } @@ -600,6 +606,9 @@ function make_vm_config() { IMAGE_FILE="${1}" ISO_FILE="${2}" case "${OS}" in + dragonflybsd) + GUEST="dragonflybsd" + IMAGE_TYPE="iso";; freebsd|ghostbsd) GUEST="freebsd" IMAGE_TYPE="iso";; @@ -646,7 +655,7 @@ EOF # OS specific tweaks case ${OS} in alma|oraclelinux|rockylinux) echo "disk_size=\"32G\"" >> "${CONF_FILE}";; - haiku|openbsd|netbsd|slackware|tails) echo "boot=\"legacy\"" >> "${CONF_FILE}";; + dragonflybsd|haiku|openbsd|netbsd|slackware|tails) echo "boot=\"legacy\"" >> "${CONF_FILE}";; kolibrios) echo "boot=\"legacy\"" >> "${CONF_FILE}" echo "disk_size=\"2G\"" >> "${CONF_FILE}" @@ -779,6 +788,19 @@ function get_devuan() { echo "${URL}/${ISO} ${HASH}" } +function get_dragonflybsd() { + local HASH="" + local ISO="" + local URL="" + + URL="http://mirror-master.dragonflybsd.org/iso-images" + ISO="dfly-x86_64-${RELEASE}_REL.iso" + HASH=$(wget -q -O- "${URL}/md5.txt" | grep "(${ISO})" | cut -d' ' -f4) + web_get "${URL}/${ISO}" "${VM_PATH}" + check_hash "${ISO}" "${HASH}" + make_vm_config "${ISO}" +} + function get_elementary() { local HASH="" local ISO="elementaryos-${RELEASE}-stable.20211218-rc.iso" From 5ac9a848eb3371abaa0ccae27a8874b69cd4ff31 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 23 Feb 2022 11:41:53 +0000 Subject: [PATCH 5/7] Refactor get_dragonflybsd() to support create_vm() --- quickget | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/quickget b/quickget index a26fe90..5289caa 100755 --- a/quickget +++ b/quickget @@ -790,15 +790,11 @@ function get_devuan() { function get_dragonflybsd() { local HASH="" - local ISO="" - local URL="" + local ISO="dfly-x86_64-${RELEASE}_REL.iso" + local URL="http://mirror-master.dragonflybsd.org/iso-images" - URL="http://mirror-master.dragonflybsd.org/iso-images" - ISO="dfly-x86_64-${RELEASE}_REL.iso" HASH=$(wget -q -O- "${URL}/md5.txt" | grep "(${ISO})" | cut -d' ' -f4) - web_get "${URL}/${ISO}" "${VM_PATH}" - check_hash "${ISO}" "${HASH}" - make_vm_config "${ISO}" + echo "${URL}/${ISO} ${HASH}" } function get_elementary() { From 480b916398b28d78e444fa445c0d60e97580ef88 Mon Sep 17 00:00:00 2001 From: nqvrg <66185596+nqvrg@users.noreply.github.com> Date: Wed, 23 Feb 2022 12:45:39 +0100 Subject: [PATCH 6/7] Add some whitespace-formatting rules (#379) * Embed whitespace rules for vim at the end of quickemu and quickget files * Add .editorconfig file with some basic whitepace rules --- .editorconfig | 12 ++++++++++++ quickemu | 2 ++ quickget | 2 ++ 3 files changed, 16 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..1014ba7 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +indent_style = space +indent_size = 2 +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false diff --git a/quickemu b/quickemu index f784cc4..1a97990 100755 --- a/quickemu +++ b/quickemu @@ -1300,3 +1300,5 @@ if [ ${SHORTCUT} -eq 1 ]; then fi vm_boot + +# vim:tabstop=2:shiftwidth=2:expandtab diff --git a/quickget b/quickget index 5289caa..e610e41 100755 --- a/quickget +++ b/quickget @@ -1731,3 +1731,5 @@ else esac exit 1 fi + +# vim:tabstop=2:shiftwidth=2:expandtab From f4701ed15465e6c724bd27104aa7d729b5a93c2a Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 23 Feb 2022 11:50:31 +0000 Subject: [PATCH 7/7] Update .editorconfig with correct spacing for quickget (4) and quickemu (2) Sorry, I managed to create these with different spacing. Something to address in the future perhaps. --- .editorconfig | 10 +++++++++- quickget | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 1014ba7..9080fe7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,6 +1,6 @@ root = true -[*] +[quickemu] charset = utf-8 end_of_line = lf insert_final_newline = true @@ -8,5 +8,13 @@ indent_style = space indent_size = 2 trim_trailing_whitespace = true +[quickget] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true + [*.md] trim_trailing_whitespace = false diff --git a/quickget b/quickget index e610e41..b263894 100755 --- a/quickget +++ b/quickget @@ -1732,4 +1732,4 @@ else exit 1 fi -# vim:tabstop=2:shiftwidth=2:expandtab +# vim:tabstop=4:shiftwidth=4:expandtab