Merge branch 'master' into slax

quickemu-project · Oct 19, 2023 · 6e181c3 · 6e181c3
2 parents babef11 + 265be79
commit 6e181c3
Show file tree

Hide file tree

Showing 9 changed files with 133 additions and 11 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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 <vm>.conf
 .SH DESCRIPTION

diff --git 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
@@ -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
@@ -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)

diff --git a/quickget b/quickget
@@ -70,6 +70,7 @@ function pretty_name() {
     rockylinux)         PRETTY_NAME="Rocky Linux";;
     slax-debian)        PRETTY_NAME="Slax Debian";;
     slax-slackware)     PRETTY_NAME="Slax Slackware";;
+    tinycore)           PRETTY_NAME="Tiny Core Linux";;
     truenas-core)       PRETTY_NAME="TrueNAS Core";;
     truenas-scale)      PRETTY_NAME="TrueNAS Scale";;
     ubuntu-budgie)      PRETTY_NAME="Ubuntu Budgie";;
@@ -183,6 +184,7 @@ function os_support() {
     echo alma \
     alpine \
     android \
+    antix \
     archlinux \
     archcraft \
     arcolinux \
@@ -228,6 +230,7 @@ function os_support() {
     oraclelinux \
     peppermint \
     popos \
+    porteus \
     reactos \
     rebornos \
     rockylinux \
@@ -236,7 +239,9 @@ function os_support() {
     slax-debian \
     slax-slackware \
     solus \
+    spiral \
     tails \
+    tinycore \
     trisquel \
     truenas-core \
     truenas-scale \
@@ -277,6 +282,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
 }
@@ -575,6 +588,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
 }
@@ -625,10 +646,25 @@ 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
 }
 
+function releases_tinycore() {
+    echo 14.0
+}
+
+function editions_tinycore() {                              echo Core TinyCore CorePlus CorePure64 TinyCorePure64
+}
+
 function releases_trisquel() {
    echo 10.0.1 11.0
 }
@@ -1075,6 +1111,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=""
@@ -1741,6 +1811,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=""
@@ -1821,6 +1904,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=""
@@ -1833,6 +1926,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=""