From 5ac9a5706dc7d911aa60ad81af412648b58cd66b Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Wed, 18 Oct 2023 17:07:42 +0100 Subject: [PATCH 1/5] docs: regenerated after PR merges bodhi and linuxlite added, also Arch install instructions included --- README.md | 10 ++++++---- build-docs | 2 +- docs/quickemu.1 | 6 +++++- docs/quickemu.1.md | 4 +++- docs/quickemu_conf.1 | 2 +- docs/quickemu_conf.1.md | 2 +- docs/quickget.1 | 6 +++++- docs/quickget.1.md | 4 +++- 8 files changed, 25 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index e336bc93d9..08e17948f5 100644 --- a/README.md +++ b/README.md @@ -146,11 +146,11 @@ sudo apt install quickgui ## Arch -Quickemu is available from the AUR (Arch user repository), and can be installed via any AUR helper. -Assuming your AUR helper is yay, -Run the following command: +Quickemu is available from the AUR (Arch user repository), and can be +installed via any AUR helper. Assuming your AUR helper is yay, Run the +following command: -```bash +``` bash yay -Sy quickemu ``` @@ -253,6 +253,7 @@ with your preferred flavour. - `arcolinux` (Arco Linux) - `batocera` (Batocera) - `blendos` (BlendOS) +- `bodhi` (Bodhi) - `bunsenlabs` (Bunsenlabs) - `cachyos` (CachyOS) - `centos-stream` (CentOS Stream) @@ -274,6 +275,7 @@ with your preferred flavour. - `kali` (Kali) - `kdeneon` (KDE Neon) - `kolibrios` (KolibriOS) +- `linuxlite` (Linux Lite) - `linuxmint` (Linux Mint) - `lmde` (Linux Mint Debian Edition) - `mageia` (Mageia) diff --git a/build-docs b/build-docs index 9840852074..15b126e5b5 160000 --- a/build-docs +++ b/build-docs @@ -1 +1 @@ -Subproject commit 984085207432ed50dfae2d6aeb3bab04a9185c49 +Subproject commit 15b126e5b583a02074da11c189c8bc9b9247c8a0 diff --git a/docs/quickemu.1 b/docs/quickemu.1 index 653a480378..e5d0574d80 100644 --- a/docs/quickemu.1 +++ b/docs/quickemu.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.1.8 .\" -.TH "QUICKEMU" "1" "October 17, 2023" "quickemu" "Quickemu User Manual" +.TH "QUICKEMU" "1" "October 18, 2023" "quickemu" "Quickemu User Manual" .SH NAME quickemu - A quick VM builder and manager .SH SYNOPSIS @@ -316,6 +316,8 @@ All the official Ubuntu flavours are supported, just replace .IP \[bu] 2 \f[CR]blendos\f[R] (BlendOS) .IP \[bu] 2 +\f[CR]bodhi\f[R] (Bodhi) +.IP \[bu] 2 \f[CR]bunsenlabs\f[R] (Bunsenlabs) .IP \[bu] 2 \f[CR]cachyos\f[R] (CachyOS) @@ -358,6 +360,8 @@ All the official Ubuntu flavours are supported, just replace .IP \[bu] 2 \f[CR]kolibrios\f[R] (KolibriOS) .IP \[bu] 2 +\f[CR]linuxlite\f[R] (Linux Lite) +.IP \[bu] 2 \f[CR]linuxmint\f[R] (Linux Mint) .IP \[bu] 2 \f[CR]lmde\f[R] (Linux Mint Debian Edition) diff --git a/docs/quickemu.1.md b/docs/quickemu.1.md index 0652bb446b..4af312c15e 100644 --- a/docs/quickemu.1.md +++ b/docs/quickemu.1.md @@ -1,6 +1,6 @@ --- author: Martin Wimpress -date: October 17, 2023 +date: October 18, 2023 footer: quickemu header: Quickemu User Manual section: 1 @@ -272,6 +272,7 @@ with your preferred flavour. - `arcolinux` (Arco Linux) - `batocera` (Batocera) - `blendos` (BlendOS) +- `bodhi` (Bodhi) - `bunsenlabs` (Bunsenlabs) - `cachyos` (CachyOS) - `centos-stream` (CentOS Stream) @@ -293,6 +294,7 @@ with your preferred flavour. - `kali` (Kali) - `kdeneon` (KDE Neon) - `kolibrios` (KolibriOS) +- `linuxlite` (Linux Lite) - `linuxmint` (Linux Mint) - `lmde` (Linux Mint Debian Edition) - `mageia` (Mageia) diff --git a/docs/quickemu_conf.1 b/docs/quickemu_conf.1 index 4fe90d6d26..2c7ca8eca3 100644 --- a/docs/quickemu_conf.1 +++ b/docs/quickemu_conf.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.1.8 .\" -.TH "QUICKEMU_CONF" "1" "October 17, 2023" "quickemu_conf" "Quickemu Configuration Manual" +.TH "QUICKEMU_CONF" "1" "October 18, 2023" "quickemu_conf" "Quickemu Configuration Manual" .SH NAME quickemu_conf - Options and parameters in the quickemu .conf .SH DESCRIPTION diff --git a/docs/quickemu_conf.1.md b/docs/quickemu_conf.1.md index 3c6b0ab9d1..2f8b4768b2 100644 --- a/docs/quickemu_conf.1.md +++ b/docs/quickemu_conf.1.md @@ -1,6 +1,6 @@ --- author: Martin Wimpress -date: October 17, 2023 +date: October 18, 2023 footer: quickemu_conf header: Quickemu Configuration Manual section: 1 diff --git a/docs/quickget.1 b/docs/quickget.1 index 74620cf226..7b81b14519 100644 --- a/docs/quickget.1 +++ b/docs/quickget.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.1.8 .\" -.TH "QUICKGET" "1" "October 17, 2023" "quickget" "Quickget User Manual" +.TH "QUICKGET" "1" "October 18, 2023" "quickget" "Quickget User Manual" .SH NAME quickget - download and prepare materials for building a quickemu VM .SH SYNOPSIS @@ -107,6 +107,8 @@ All the official Ubuntu flavours are supported, just replace .IP \[bu] 2 \f[CR]blendos\f[R] (BlendOS) .IP \[bu] 2 +\f[CR]bodhi\f[R] (Bodhi) +.IP \[bu] 2 \f[CR]bunsenlabs\f[R] (Bunsenlabs) .IP \[bu] 2 \f[CR]cachyos\f[R] (CachyOS) @@ -149,6 +151,8 @@ All the official Ubuntu flavours are supported, just replace .IP \[bu] 2 \f[CR]kolibrios\f[R] (KolibriOS) .IP \[bu] 2 +\f[CR]linuxlite\f[R] (Linux Lite) +.IP \[bu] 2 \f[CR]linuxmint\f[R] (Linux Mint) .IP \[bu] 2 \f[CR]lmde\f[R] (Linux Mint Debian Edition) diff --git a/docs/quickget.1.md b/docs/quickget.1.md index 29023bdb38..0050907a0f 100644 --- a/docs/quickget.1.md +++ b/docs/quickget.1.md @@ -1,6 +1,6 @@ --- author: Martin Wimpress -date: October 17, 2023 +date: October 18, 2023 footer: quickget header: Quickget User Manual section: 1 @@ -99,6 +99,7 @@ with your preferred flavour. - `arcolinux` (Arco Linux) - `batocera` (Batocera) - `blendos` (BlendOS) +- `bodhi` (Bodhi) - `bunsenlabs` (Bunsenlabs) - `cachyos` (CachyOS) - `centos-stream` (CentOS Stream) @@ -120,6 +121,7 @@ with your preferred flavour. - `kali` (Kali) - `kdeneon` (KDE Neon) - `kolibrios` (KolibriOS) +- `linuxlite` (Linux Lite) - `linuxmint` (Linux Mint) - `lmde` (Linux Mint Debian Edition) - `mageia` (Mageia) From c0a8fe27a72258dd69ab400af2d08daa2e903a6e Mon Sep 17 00:00:00 2001 From: zenobit Date: Sat, 16 Sep 2023 13:08:11 +0200 Subject: [PATCH 2/5] Add Tiny Core Linux --- quickget | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/quickget b/quickget index 4e0279f63e..4b63d71bac 100755 --- a/quickget +++ b/quickget @@ -68,6 +68,7 @@ function pretty_name() { reactos) PRETTY_NAME="ReactOS";; rebornos) PRETTY_NAME="RebornOS";; rockylinux) PRETTY_NAME="Rocky Linux";; + tinycore) PRETTY_NAME="Tiny Core Linux";; truenas-core) PRETTY_NAME="TrueNAS Core";; truenas-scale) PRETTY_NAME="TrueNAS Scale";; ubuntu-budgie) PRETTY_NAME="Ubuntu Budgie";; @@ -233,6 +234,7 @@ function os_support() { slackware \ solus \ tails \ + tinycore \ trisquel \ truenas-core \ truenas-scale \ @@ -617,6 +619,13 @@ function releases_tails() { echo stable } +function releases_tinycore() { + echo 14.0 +} + +function editions_tinycore() { echo Core TinyCore CorePlus CorePure64 TinyCorePure64 +} + function releases_trisquel() { echo 10.0.1 11.0 } @@ -937,7 +946,7 @@ EOF echo "disk_size=\"32G\"" >> "${CONF_FILE}";; batocera) echo "disk_size=\"8G\"" >> "${CONF_FILE}";; - dragonflybsd|haiku|openbsd|netbsd|slackware|tails) + dragonflybsd|haiku|openbsd|netbsd|slackware|tails|tinycore) echo "boot=\"legacy\"" >> "${CONF_FILE}";; deepin) echo "disk_size=\"64G\"" >> "${CONF_FILE}" @@ -1799,6 +1808,21 @@ function get_tails() { echo "${URL} ${HASH}" } +function get_tinycore() { + local HASH="" + local ISO="${EDITION}-${RELEASE}.iso" + local URL="" + + if [ "${EDITION}" == "Core" ] || [ "${EDITION}" == "TinyCore" ] || [ "${EDITION}" == "CorePlus" ]; then + URL="http://www.tinycorelinux.net/14.x/x86/release" + elif [ "${EDITION}" == "CorePure64" ] || [ "${EDITION}" == "TinyCorePure64" ]; then + URL="http://www.tinycorelinux.net/14.x/x86_64/release" + fi + + HASH=$(wget -q -O- "${URL}/${ISO}.md5.txt" | cut -d' ' -f1) + echo "${URL}/${ISO} ${HASH}" +} + function get_trisquel() { local EDITION="${1:-}" local HASH="" From 1b3c113f8d5f83c9883e525f95cc697b3b46a1a9 Mon Sep 17 00:00:00 2001 From: zenobit Date: Thu, 12 Oct 2023 07:46:28 +0200 Subject: [PATCH 3/5] Add Antix --- quickget | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/quickget b/quickget index 4b63d71bac..386b73d69c 100755 --- a/quickget +++ b/quickget @@ -182,6 +182,7 @@ function os_support() { echo alma \ alpine \ android \ + antix \ archlinux \ archcraft \ arcolinux \ @@ -275,6 +276,14 @@ function editions_android() { echo x86 x86_64 } +function releases_antix() { + echo 21 22 23 +} + +function editions_antix() { + echo net-sysv core-sysv base-sysv full-sysv net-runit core-runit base-runit full-runit +} + function releases_archlinux() { echo latest } @@ -1072,6 +1081,40 @@ function get_android() { echo "${URL}/${ISO} ${HASH}" } +function get_antix() { + local EDITION="${1:-}" + local HASH="" + local ISO="" + local URL="https://sourceforge.net/projects/antix-linux/files/Final/antiX-${RELEASE}" + + case ${RELEASE} in + 21) URL_runit="${URL}/runit-bullseye";; + *) URL_runit="${URL}/runit-antiX-${RELEASE}";; + esac + + case ${EDITION} in + net-sysv) ISO="antiX-${RELEASE}-net_x64-net.iso";; + core-sysv) ISO="antiX-${RELEASE}_x64-core.iso";; + base-sysv) ISO="antiX-${RELEASE}_x64-base.iso";; + full-sysv) ISO="antiX-${RELEASE}_x64-full.iso";; + net-runit) ISO="antiX-${RELEASE}-runit-net_x64-net.iso" + URL="${URL_runit}" + ;; + core-runit) ISO="antiX-${RELEASE}-runit_x64-core.iso" + URL="${URL_runit}" + ;; + base-runit) ISO="antiX-${RELEASE}-runit_x64-base.iso" + URL="${URL_runit}" + ;; + full-runit) ISO="antiX-${RELEASE}-runit_x64-full.iso" + URL="${URL_runit}" + ;; + esac + + HASH=$(wget -q -O- ${URL}/README.txt | grep "${ISO}" | cut -d' ' -f1 | head -1) + echo "${URL}/${ISO} ${HASH}" +} + function get_archlinux() { local HASH="" local ISO="" From ad0f1f2d3de30189b133136bbc2e2827ac5cc575 Mon Sep 17 00:00:00 2001 From: zenobit Date: Wed, 11 Oct 2023 18:35:32 +0200 Subject: [PATCH 4/5] Add Porteus --- quickget | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/quickget b/quickget index 386b73d69c..00e59f1cbf 100755 --- a/quickget +++ b/quickget @@ -228,6 +228,7 @@ function os_support() { oraclelinux \ peppermint \ popos \ + porteus \ reactos \ rebornos \ rockylinux \ @@ -582,6 +583,14 @@ function editions_popos() { echo intel nvidia } +function releases_porteus() { + echo 5.0 5.01 +} + +function editions_porteus() { + echo cinnamon gnome kde lxde lxqt mate openbox xfce +} + function releases_reactos() { echo latest } @@ -1781,6 +1790,19 @@ function get_popos() { echo "${URL} ${HASH}" } +function get_porteus() { + local EDITION="${1:-}" + local HASH="" + local ISO="" + local URL="" + + edition="${EDITION~~}" + ISO="Porteus-${edition}-v${RELEASE}-x86_64.iso" + URL="https://mirrors.dotsrc.org/porteus/x86_64/Porteus-v${RELEASE}" + HASH=$(wget -q -O- "${URL}/sha256sums.txt" | grep "${ISO}" | cut -d' ' -f1) + echo "${URL}/${ISO} ${HASH}" +} + function get_reactos() { local HASH="" local URL="" From 265be797776889bc1c96149fa8fa7bb396ffaad7 Mon Sep 17 00:00:00 2001 From: zenobit Date: Sun, 8 Oct 2023 03:18:34 +0200 Subject: [PATCH 5/5] Add SpiralLinux --- quickget | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/quickget b/quickget index 00e59f1cbf..cb2f20e272 100755 --- a/quickget +++ b/quickget @@ -235,6 +235,7 @@ function os_support() { siduction \ slackware \ solus \ + spiral \ tails \ tinycore \ trisquel \ @@ -633,6 +634,14 @@ function editions_solus() { echo Budgie GNOME MATE Plasma } +function releases_spiral() { + echo latest +} + +function editions_spiral() { + echo Plasma XFCE Mate LXQt Gnome Budgie Cinnamon Builder +} + function releases_tails() { echo stable } @@ -1861,6 +1870,16 @@ function get_solus() { echo "${URL}/${ISO} ${HASH}" } +function get_spiral() { + local EDITION="${1:-}" + local HASH="" + local ISO="SpiralLinux_${EDITION}_12.231005_x86-64.iso" + local URL="https://sourceforge.net/projects/spirallinux/files/12.231005" + + HASH=$(wget -q -O- 'https://sourceforge.net/projects/spirallinux/rss?path=/' | grep "${ISO}" | grep 'md5' | cut -d'<' -f3 | cut -d'>' -f2) + echo "${URL}/${ISO}" "${HASH}" +} + function get_tails() { local ISO="" local JSON=""