From b085bebfbe3703be2ed1b3609227b9a72a8f492b Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@wimpress.org>
Date: Fri, 3 May 2024 01:49:39 +0100
Subject: [PATCH] style: update usage/help for quickemu and quickget

---
 quickemu | 14 +++++++++++--
 quickget | 60 +++++++++++++++++++++++++++++---------------------------
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/quickemu b/quickemu
index ef15639..53d1bbf 100755
--- a/quickemu
+++ b/quickemu
@@ -1385,11 +1385,21 @@ EOF
 }
 
 function usage() {
+    echo "             _      _"
+    echo "  __ _ _   _(_) ___| | _____ _ __ ___  _   _"
+    echo " / _' | | | | |/ __| |/ / _ \ '_ ' _ \| | | |"
+    echo "| (_| | |_| | | (__|   <  __/ | | | | | |_| |"
+    echo " \__, |\__,_|_|\___|_|\_\___|_| |_| |_|\__,_|"
+    echo "    |_| v${VERSION}, using qemu ${QEMU_VER_LONG}"
+    echo "--------------------------------------------------------------------------------"
+    echo " Project - https://github.com/quickemu-project/quickemu"
+    echo " Discord - https://wimpysworld.io/discord"
+    echo "--------------------------------------------------------------------------------"
     echo
     echo "Usage"
-    echo "  ${LAUNCHER} --vm ubuntu.conf [optional params]"
+    echo "  ${LAUNCHER} --vm ubuntu.conf <arguments>"
     echo
-    echo "List of optional parameters:"
+    echo "Arguments"
     echo "  --access                          : Enable remote spice access support. 'local' (default), 'remote', 'clientipaddress'"
     echo "  --braille                         : Enable braille support. Requires SDL."
     echo "  --delete-disk                     : Delete the disk image and EFI variables"
diff --git a/quickget b/quickget
index 7cdf5ef..42ba03a 100755
--- a/quickget
+++ b/quickget
@@ -3337,42 +3337,44 @@ function create_vm() {
 
 function help_message() {
     #shellcheck disable=SC2016
-    printf '                           _              _
-         __ _ _   _ _  ___║ ║ ____ _  ___║ ║_
-        / _` ║ ║ ║ ║ ║/ __║ ║/ / _` ║/ _ \ __║            MIT
-       ( (_║ ║ ║_║ ║ ║ (__║   < (_║ ║  __/ ║_           license
-        \__, ║\__,_║_║\___║_║\ \__, ║\___║\__║       version: %s
-           ║_║                 ║___/            part of Quickemu project
+    printf '
+             _      _              _
+  __ _ _   _(_) ___| | ____ _  ___| |_
+ / _` | | | | |/ __| |/ / _` |/ _ \ __|
+| (_| | |_| | | (__|   < (_| |  __/ |_
+ \__, |\__,_|_|\___|_|\_\__, |\___|\__|
+    |_|                 |___/ v%s, using curl %s
 --------------------------------------------------------------------------------
-               > Quickly create and run optimised Linux, <
-             > Windows and macOS desktop virtual machines <
-
-         Project - https://github.com/quickemu-project/quickemu
-                Discord - https://wimpysworld.io/discord
+ Project - https://github.com/quickemu-project/quickemu
+ Discord - https://wimpysworld.io/discord
 --------------------------------------------------------------------------------
 
-Basic Usage:                          Advanced Usage:
- quickget <os> <release> [edition]     quickget <arg> [path] <os> [re] [ed]
- quickget ubuntu 22.04                 quickget --download ubuntu 22.04
+Usage:
+  quickget <os> <release> [edition]
+  quickget ubuntu 22.04
+
+Advanced usage:
+  quickget <arg> [path] <os> [re] [ed]
+  quickget --download ubuntu 22.04
 
 Arguments:
- -[12345]              <os>           : Show info* about OS
- --download       (-d) <os> <re> [ed] : Download image; no VM configuration
- --create-config (-cc) <os> [path/url]: Create default VM config for image
- --open-homepage  (-o) <os>           : Open homepage for the OS
- --version        (-v)                : Show version
- --help           (-h)                : Show this help message
---------------------- For testing & development --------------------------------
- --url            (-u) [os] [re] [ed] : Show URL(s) for what specified or All
- --check          (-c) [os] [re] [ed] : Check URL(s) for what specified or All
- --list           (-l)                : List all supported systems
- --list-csv      (-lc)                : List everything in csv format
- --list-json     (-lj)                : List everything in json format
+  -[12345]              <os>           : Show info* about OS
+  --download       (-d) <os> <re> [ed] : Download image; no VM configuration
+  --create-config (-cc) <os> [path/url]: Create default VM config for image
+  --open-homepage  (-o) <os>           : Open homepage for the OS
+  --version        (-v)                : Show version
+  --help           (-h)                : Show this help message
+-------------------------- For testing & development ---------------------------
+  --url            (-u) [os] [re] [ed] : Show image URL(s)
+  --check          (-c) [os] [re] [ed] : Check image URL(s)
+  --list           (-l)                : List all supported systems
+  --list-csv      (-lc)                : List everything in csv format
+  --list-json     (-lj)                : List everything in json format
 --------------------------------------------------------------------------------
-      *info: 1=Logo 2=Based of 3=Credentials 4=Homepage 5=Short info
-       Can be used in any combination like -13254 or -52
+ *info: 1=Logo 2=Based of 3=Credentials 4=Homepage 5=Short info
+        Can be used in any combination like -13254 or -52
 
-supported Operating Systems:\n' "$(quickemu --version)"
+Supported Operating Systems:\n\n' "$(quickemu --version)" "${CURL_VERSION}"
     os_support | fold -s -w "$(tput cols)"
 }