Merge remote-tracking branch 'upstream/master' into fix-mxlinux-releases

quickemu-project · Oct 15, 2024 · bce796b · bce796b
2 parents aabae7e + 84595dc
commit bce796b
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 41 deletions.
diff --git a/.github/workflows/flake-checker.yml b/.github/workflows/flake-checker.yml
@@ -16,6 +16,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: DeterminateSystems/nix-installer-action@v13
-      - uses: DeterminateSystems/magic-nix-cache-action@v7
-      - uses: DeterminateSystems/flake-checker-action@v8
+      - uses: DeterminateSystems/nix-installer-action@v14
+      - uses: DeterminateSystems/magic-nix-cache-action@v8
+      - uses: DeterminateSystems/flake-checker-action@v9
diff --git a/.github/workflows/flake-updater.yml b/.github/workflows/flake-updater.yml
@@ -13,8 +13,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: DeterminateSystems/nix-installer-action@v13
-      - uses: DeterminateSystems/magic-nix-cache-action@v7
-      - uses: DeterminateSystems/update-flake-lock@v23
+      - uses: DeterminateSystems/nix-installer-action@v14
+      - uses: DeterminateSystems/magic-nix-cache-action@v8
+      - uses: DeterminateSystems/update-flake-lock@v24
         with:
           pr-title: "chore: update flake.lock"
diff --git a/.github/workflows/test-build-quickemu.yml b/.github/workflows/test-build-quickemu.yml
@@ -53,9 +53,9 @@ jobs:
       - name: "Checkout 🥡"
         uses: "actions/checkout@v4"
       - name: "Install Nix ❄️"
-        uses: "DeterminateSystems/nix-installer-action@v13"
+        uses: "DeterminateSystems/nix-installer-action@v14"
       - name: "Enable Magic Nix Cache 🪄"
-        uses: "DeterminateSystems/magic-nix-cache-action@v7"
+        uses: "DeterminateSystems/magic-nix-cache-action@v8"
       - name: "Build & Test .nix ❄️"
         run: |
           nix build .#quickemu

diff --git a/docs/Makefile b/docs/Makefile
@@ -9,16 +9,18 @@ datadir := $(datarootdir)
 mandir := $(datarootdir)/man
 bindir :=  $(PREFIX)/bin
 
-all: quickget.1 quickemu.1 quickemu_conf.1
+all: quickget.1 quickemu.1 quickemu_conf.5
 
 clean:
-	rm *.1
+	rm *.1 *.5
 
 install_docs: all
 	install -d $(DESTDIR)$(mandir)/man1
+	install -d $(DESTDIR)$(mandir)/man5
 	install -m 644 quickget.1 $(DESTDIR)$(mandir)/man1
 	install -m 644 quickemu.1 $(DESTDIR)$(mandir)/man1
-	install -m 644 quickemu_conf.1 $(DESTDIR)$(mandir)/man1
+	install -m 644 quickemu_conf.5 $(DESTDIR)$(mandir)/man5
+	rm -f $(DESTDIR)$(mandir)/man1/quickemu_conf.1
 
 #   install -m 644 quickgui.1 $(DESTDIR)$(mandir)/man1
 
@@ -34,7 +36,7 @@ install: install_bins  install_docs
 uninstall::
 	rm -f $(DESTDIR)$(mandir)/man1/quickget.1
 	rm -f $(DESTDIR)$(mandir)/man1/quickemu.1
-	rm -f $(DESTDIR)$(mandir)/man1/quickemu_conf.1
+	rm -f $(DESTDIR)$(mandir)/man5/quickemu_conf.5
 	rm -f $(DESTDIR)$(bindir)/quickget
 	rm -f $(DESTDIR)$(bindir)/quickemu
 	rm -f $(DESTDIR)$(bindir)/quickreport

diff --git a/docs/pandoc-man.mk b/docs/pandoc-man.mk
@@ -1,11 +1,7 @@
 PANDOC ?= pandoc
+PANDOC_OPTIONS = -f gfm+definition_lists
 
-MANSECTION ?= 1
+.SUFFIXES: .1.md .1 .5.md .5
 
-PANDOC_OPTIONS=-f gfm+definition_lists --standalone
-
-
-MANPAGE.md = $(PANDOC) --standalone $(PANDOC_OPTIONS) --to man
-
-%.$(MANSECTION): %.$(MANSECTION).md
-	$(MANPAGE.md) $< -o $@
+.1.md.1 .5.md.5:
+	$(PANDOC) --standalone $(PANDOC_OPTIONS) --to man -o $@ $<
diff --git a/docs/quickemu.1 b/docs/quickemu.1
@@ -1325,6 +1325,6 @@ Full sources at: \c
 .UR https://github.com/quickemu-project/quickemu
 .UE \c
 .PP
-quickemu_conf(1), quickget(1), quickgui(1)
+quickemu_conf(5), quickget(1), quickgui(1)
 .SH AUTHORS
 Martin Wimpress.
diff --git a/docs/quickemu.1.md b/docs/quickemu.1.md
@@ -849,4 +849,4 @@ Submit bug reports online at:
 
 Full sources at: <https://github.com/quickemu-project/quickemu>
 
-quickemu_conf(1), quickget(1), quickgui(1)
+quickemu_conf(5), quickget(1), quickgui(1)
diff --git a/docs/quickemu_conf.1 → docs/quickemu_conf.5 b/docs/quickemu_conf.1 → docs/quickemu_conf.5
@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 3.3
 .\"
-.TH "QUICKEMU_CONF" "1" "August 2, 2024" "quickemu_conf" "Quickemu Configuration Manual"
+.TH "QUICKEMU_CONF" "5" "August 2, 2024" "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 → docs/quickemu_conf.5.md b/docs/quickemu_conf.1.md → docs/quickemu_conf.5.md
@@ -3,7 +3,7 @@ author: Martin Wimpress
 date: August 2, 2024
 footer: quickemu_conf
 header: Quickemu Configuration Manual
-section: 1
+section: 5
 title: QUICKEMU_CONF
 ---
 

diff --git a/docs/quickget.1 b/docs/quickget.1
@@ -701,6 +701,6 @@ Full sources at: \c
 .UR https://github.com/quickemu-project/quickemu
 .UE \c
 .PP
-quickemu(1), quickemu_conf(1), quickgui(1)
+quickemu(1), quickemu_conf(5), quickgui(1)
 .SH AUTHORS
 Martin Wimpress.
diff --git a/docs/quickget.1.md b/docs/quickget.1.md
@@ -485,4 +485,4 @@ Submit bug reports online at:
 
 Full sources at: <https://github.com/quickemu-project/quickemu>
 
-quickemu(1), quickemu_conf(1), quickgui(1)
+quickemu(1), quickemu_conf(5), quickgui(1)
diff --git a/flake.lock b/flake.lock
diff --git a/package.nix b/package.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    installManPage docs/quickget.1 docs/quickemu.1 docs/quickemu_conf.1
+    installManPage docs/quickget.1 docs/quickemu.1 docs/quickemu_conf.5
     install -Dm755 -t "$out/bin" chunkcheck quickemu quickget quickreport
 
     # spice-gtk needs to be put in suffix so that when virtualisation.spiceUSBRedirection

diff --git a/quickget b/quickget
@@ -132,7 +132,7 @@ function pretty_name() {
 
 # Just in case quickget want use it
 function os_homepage() {
-    os_info "${1}" | cut -d'|' -f 4
+    os_info "${1}" | cut -d'|' -f 3
 }
 
 function error_specify_os() {
@@ -759,7 +759,7 @@ function releases_guix() {
 }
 
 function releases_haiku() {
-    echo r1beta4 r1beta3
+    echo r1beta5 r1beta4 r1beta3
 }
 
 function editions_haiku() {
@@ -787,7 +787,7 @@ function releases_linuxlite() {
 }
 
 function releases_linuxmint() {
-    echo 21.3 21.2 21.1 21 20.3 20.2
+    echo 22 21.3 21.2 21.1 21 20.3 20.2
 }
 
 function editions_linuxmint() {
@@ -901,7 +901,7 @@ function editions_peppermint() {
 }
 
 function releases_popos() {
-    echo 22.04 21.10 20.04
+    echo 22.04 20.04
 }
 
 function editions_popos() {
@@ -3240,7 +3240,7 @@ function open_homepage() {
     if [ -z "$(os_info "${1}")" ]; then
         error_specify_os
     else
-        URL="$(os_info "${1}" | cut -d'|' -f 4)"
+        URL="$(os_info "${1}" | cut -d'|' -f 3)"
         # shellcheck disable=SC2034
         XDG_OPEN=$(xdg-open "${URL}" || sensible-browser "${URL}" || x-www-browser "${URL}" || gnome-open "${URL}")
         exit 0
@@ -3362,10 +3362,9 @@ function create_config() {
 
 # Use command -v command to check if quickemu is in the system's PATH and
 # fallback to checking if quickemu is in the current directory.
-function resolve_quickemu() {
-    if command -v quickemu >/dev/null 2>&1; then
-        command -v quickemu
-    elif [ -f "./quickemu" ]; then
+function resolve_quickemu() {   
+    command -v quickemu || \
+    if [ -x "./quickemu" ]; then
         echo "$(pwd)/quickemu"
     else
         echo "quickemu not found" >&2