[merge] from unstable into stable

QPKGs/sherpa/build/sherpa_240405.qpkg.md5

@@ -1 +1 @@
-a5a9a67152f081d83d2d6f0e4ad8f78a  build/sherpa_240405.qpkg
+120a53749924cdc2cacddad1a404c45a  build/sherpa_240405.qpkg

QPKGs/sherpa/build/sherpa_240406.qpkg.md5

@@ -0,0 +1 @@
+efe231e546f9d130310704c206facfe6  build/sherpa_240406.qpkg

QPKGs/sherpa/qpkg.cfg

@@ -1,5 +1,5 @@
 QPKG_NAME="sherpa"
-QPKG_VER="240405"
+QPKG_VER="240406"
 QPKG_AUTHOR="OneCD"
 QPKG_RC_NUM="500"
 QPKG_SERVICE_PROGRAM="sherpa-service.sh"

QPKGs/sherpa/shared/sherpa-loader.sh

@@ -24,7 +24,7 @@
 readonly USER_ARGS_RAW=$*
 Init()
 {
-export LOADER_SCRIPT_VER='240405'
+export LOADER_SCRIPT_VER='240406'
 export LOADER_SCRIPT_PPID=$PPID
 readonly QPKG_NAME=sherpa
 readonly CHARS_REGULAR_PROMPT='$ '

docs/QNAP-forum-announcement.bbcode

@@ -1,21 +1,22 @@
 [img]https://i.imgur.com/KTZ7xCy.png[/img]
-[i]The world's first multi-action CLI package-manager![/i]
+[b][u][size=150]sherpa: a mini-package-manager for QNAP NAS[/size][/u][/b]
 
-[b][u][size=120]Description[/size][/u][/b]
+[img]https://img.shields.io/github/v/release/OneCDOnly/sherpa[/img] [img]https://img.shields.io/github/downloads/OneCDOnly/sherpa/latest/total[/img] [img]https://img.shields.io/github/languages/code-size/OneCDOnly/sherpa[/img] [img]https://img.shields.io/badge/License-GPLv3-blue.svg[/img]
 
-A mini-package-manager for QNAP® NAS.
+The world's first multi-action CLI package-manager!
 
 Package management via [b]sherpa[/b] provides extra features like easy application backup, upgrading, service and daemon management, self-checking and repair, and all operations may be automated via cron.
 
-[b][color=#FF0000]Please note:[/color][/b] this is a command-line package and service manager, it's in beta status, and packages have been known to break due to auto-upgrades going wrong. If you would like-to (and are able-to) help by diagnosing and providing logs, and don't mind things breaking from time-to-time, please use this package. If you're looking for complete stability and want a "set-and-forget" solution, it won't be found here just yet. [b]Do not[/b] use sherpa in production environments, unless you're pretty-handy with the CLI and debugging bash and Python scripts, and/or can afford for applications to be out-of-order for extended periods of time.
+[list][b][color=#FF0000]Caution:[/color][/b] this is a command-line package and service manager, it's in beta status, and packages have been known to break due to auto-upgrades going wrong. If you would like-to (and are able-to) help by diagnosing and providing logs, and don't mind things breaking from time-to-time, please use this package. If you're looking for complete stability and want a "set-and-forget" solution, it won't be found here just yet. [b]Do not[/b] use sherpa in production environments, unless you're pretty-handy with the CLI and debugging bash and Python scripts, and/or can afford for applications to be out-of-order for extended periods of time.
 
 That said: the majority of development is now complete, and I'm currently working-on increasing stability during auto-package upgrades. So, [b]sherpa[/b] will work beautifully on a fresh (or new) system, but can experience issues when individual application updates are released.
+[/list]
 
 [b][url=https://github.com/OneCDOnly/sherpa/wiki/Packages]Click here for available packages[/url][/b]
 
 [b][u][size=120]Installation[/size][/u][/b]
 
-[list=1][*][url=https://github.com/OneCDOnly/sherpa/releases/download/v240405/sherpa_240405.qpkg]Click here to download the [b]sherpa[/b] QPKG[/url].
+[list=1][*][url=https://github.com/OneCDOnly/sherpa/releases/latest/download/sherpa.qpkg]Click here to download the latest [b]sherpa[/b] QPKG[/url].
 
 [*]Install the QPKG manually through your QTS App Center UI. This QPKG is not digitally signed, so you'll need to allow unsigned packages to be installed in your App Center before installing it. It can "sign" itself (and all supported QPKGs) after installation.
 [/list]

docs/QNAP-forum-announcement.bbcode.source

@@ -1,21 +1,22 @@
 [img]https://i.imgur.com/KTZ7xCy.png[/img]
-[i]The world's first multi-action CLI package-manager![/i]
+[b][u][size=150]sherpa: a mini-package-manager for QNAP NAS[/size][/u][/b]
 
-[b][u][size=120]Description[/size][/u][/b]
+[img]https://img.shields.io/github/v/release/OneCDOnly/sherpa[/img] [img]https://img.shields.io/github/downloads/OneCDOnly/sherpa/latest/total[/img] [img]https://img.shields.io/github/languages/code-size/OneCDOnly/sherpa[/img] [img]https://img.shields.io/badge/License-GPLv3-blue.svg[/img]
 
-<?title_description?>.
+The world's first multi-action CLI package-manager!
 
 Package management via [b]sherpa[/b] provides extra features like easy application backup, upgrading, service and daemon management, self-checking and repair, and all operations may be automated via cron.
 
-[b][color=#FF0000]Please note:[/color][/b] this is a command-line package and service manager, it's in beta status, and packages have been known to break due to auto-upgrades going wrong. If you would like-to (and are able-to) help by diagnosing and providing logs, and don't mind things breaking from time-to-time, please use this package. If you're looking for complete stability and want a "set-and-forget" solution, it won't be found here just yet. [b]Do not[/b] use sherpa in production environments, unless you're pretty-handy with the CLI and debugging bash and Python scripts, and/or can afford for applications to be out-of-order for extended periods of time.
+[list][b][color=#FF0000]Caution:[/color][/b] this is a command-line package and service manager, it's in beta status, and packages have been known to break due to auto-upgrades going wrong. If you would like-to (and are able-to) help by diagnosing and providing logs, and don't mind things breaking from time-to-time, please use this package. If you're looking for complete stability and want a "set-and-forget" solution, it won't be found here just yet. [b]Do not[/b] use sherpa in production environments, unless you're pretty-handy with the CLI and debugging bash and Python scripts, and/or can afford for applications to be out-of-order for extended periods of time.
 
 That said: the majority of development is now complete, and I'm currently working-on increasing stability during auto-package upgrades. So, [b]sherpa[/b] will work beautifully on a fresh (or new) system, but can experience issues when individual application updates are released.
+[/list]
 
 [b][url=https://github.com/OneCDOnly/sherpa/wiki/Packages]Click here for available packages[/url][/b]
 
 [b][u][size=120]Installation[/size][/u][/b]
 
-[list=1][*][url=https://github.com/OneCDOnly/sherpa/releases/download/v<?build_date?>/sherpa_<?latest_release_version?>.qpkg]Click here to download the [b]sherpa[/b] QPKG[/url].
+[list=1][*][url=https://github.com/OneCDOnly/sherpa/releases/latest/download/sherpa.qpkg]Click here to download the latest [b]sherpa[/b] QPKG[/url].
 
 [*]Install the QPKG manually through your QTS App Center UI. This QPKG is not digitally signed, so you'll need to allow unsigned packages to be installed in your App Center before installing it. It can "sign" itself (and all supported QPKGs) after installation.
 [/list]

docs/README.md

@@ -1,24 +1,25 @@
 ![icon](images/sherpa.readme.png)
 
-<p align="center"><i>The world's first multi-action CLI package-manager!</i></p>
+sherpa: a mini-package-manager for QNAP NAS
+============================================
 
+![GitHub Release](https://img.shields.io/github/v/release/OneCDOnly/sherpa) ![GitHub Downloads (all assets, latest release)](https://img.shields.io/github/downloads/OneCDOnly/sherpa/latest/total) ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/OneCDOnly/sherpa) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
-## Description
-
-A mini-package-manager for QNAP® NAS.
+The world's first multi-action CLI package-manager!
 
 Package management via **sherpa** provides extra features like easy application backup, upgrading, service and daemon management, self-checking and repair, and all operations may be automated via cron.
 
 > [!CAUTION]
 > This is a command-line package and service manager, it's in beta status, and packages have been known to break due to auto-upgrades going wrong. If you would like-to (and are able-to) help by diagnosing and providing logs, and don't mind things breaking from time-to-time, please use this package. If you're looking for complete stability and want a "set-and-forget" solution, it won't be found here just yet. <b>Do not</b> use sherpa in production environments, unless you're pretty-handy with the CLI and debugging bash and Python scripts, and/or can afford for applications to be out-of-order for extended periods of time.
+>
 > That said: the majority of development is now complete, and I'm currently working-on increasing stability during auto-package upgrades. So, <b>sherpa</b> will work beautifully on a fresh (or new) system, but can experience issues when individual application updates are released.
 
 <b>[Click here for available packages](https://github.com/OneCDOnly/sherpa/wiki/Packages)</b>
 
 
 ## Installation
 
-1) [Click here to download the **sherpa** QPKG](https://github.com/OneCDOnly/sherpa/releases/download/v240405/sherpa_240405.qpkg).
+1) [Click here to download the latest **sherpa** QPKG](https://github.com/OneCDOnly/sherpa/releases/latest/download/sherpa.qpkg).
 
 2) Install the QPKG manually through your QTS App Center UI. This QPKG is not digitally signed, so you'll need to allow unsigned packages to be installed in your App Center before installing it. It can "sign" itself (and all supported QPKGs) after installation.
 

docs/README.source

@@ -1,24 +1,25 @@
 ![icon](images/sherpa.readme.png)
 
-<p align="center"><i>The world's first multi-action CLI package-manager!</i></p>
+sherpa: a mini-package-manager for QNAP NAS
+============================================
 
+![GitHub Release](https://img.shields.io/github/v/release/OneCDOnly/sherpa) ![GitHub Downloads (all assets, latest release)](https://img.shields.io/github/downloads/OneCDOnly/sherpa/latest/total) ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/OneCDOnly/sherpa) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 
-## Description
-
-<?title_description?>.
+The world's first multi-action CLI package-manager!
 
 Package management via **sherpa** provides extra features like easy application backup, upgrading, service and daemon management, self-checking and repair, and all operations may be automated via cron.
 
 > [!CAUTION]
 > This is a command-line package and service manager, it's in beta status, and packages have been known to break due to auto-upgrades going wrong. If you would like-to (and are able-to) help by diagnosing and providing logs, and don't mind things breaking from time-to-time, please use this package. If you're looking for complete stability and want a "set-and-forget" solution, it won't be found here just yet. <b>Do not</b> use sherpa in production environments, unless you're pretty-handy with the CLI and debugging bash and Python scripts, and/or can afford for applications to be out-of-order for extended periods of time.
+>
 > That said: the majority of development is now complete, and I'm currently working-on increasing stability during auto-package upgrades. So, <b>sherpa</b> will work beautifully on a fresh (or new) system, but can experience issues when individual application updates are released.
 
 <b>[Click here for available packages](https://github.com/OneCDOnly/sherpa/wiki/Packages)</b>
 
 
 ## Installation
 
-1) [Click here to download the **sherpa** QPKG](https://github.com/OneCDOnly/sherpa/releases/download/v<?build_date?>/sherpa_<?latest_release_version?>.qpkg).
+1) [Click here to download the latest **sherpa** QPKG](https://github.com/OneCDOnly/sherpa/releases/latest/download/sherpa.qpkg).
 
 2) Install the QPKG manually through your QTS App Center UI. This QPKG is not digitally signed, so you'll need to allow unsigned packages to be installed in your App Center before installing it. It can "sign" itself (and all supported QPKGs) after installation.
 

support/build-forum-announcement.sh

@@ -2,11 +2,6 @@
 
 . vars.source || exit
 
-[[ ! -e $highest_package_versions_found_sorted_pathfile ]] && ./build-packages.sh
-
-latest_release_version=$(grep ^sherpa_ "$highest_package_versions_found_sorted_pathfile" | tr -s ' ' | cut -d' ' -f4)
-echo "latest release version: $latest_release_version"
-
 source_pathfile=$docs_path/$forum_source_file
 target_pathfile=$docs_path/$forum_file
 

support/build-qpkgs.sh

@@ -130,4 +130,12 @@ for d in "$qpkgs_path"/*; do
 	echo "QPKG arches: $(ColourTextBrightGreen rebuilt)"
 done
 
+# create sherpa.qpkg from most recent qbuild file.
+latest_release_version=$(grep ^sherpa_ "$highest_package_versions_found_sorted_pathfile" | tr -s ' ' | cut -d' ' -f4)
+
+if [[ -n $latest_release_version ]]; then
+	echo "latest release version: $latest_release_version"
+	cp -f "$qpkgs_path/sherpa/build/sherpa_$latest_release_version.qpkg" "$target_path/sherpa.qpkg"
+fi
+
 exit 0

support/build-readme.sh

@@ -2,11 +2,6 @@
 
 . vars.source || exit
 
-[[ ! -e $highest_package_versions_found_sorted_pathfile ]] && ./build-packages.sh
-
-latest_release_version=$(grep ^sherpa_ "$highest_package_versions_found_sorted_pathfile" | tr -s ' ' | cut -d' ' -f4)
-echo "latest release version: $latest_release_version"
-
 source_pathfile=$docs_path/$readme_source_file
 target_pathfile=$docs_path/$readme_file
 

support/highest_package_versions_found.tbl

@@ -75,7 +75,7 @@ SABnzbd_240405_x86_64.qpkg.md5       SABnzbd_240405_x86_64.qpkg       SABnzbd
 SABnzbd_240405_x86.qpkg.md5          SABnzbd_240405_x86.qpkg          SABnzbd              240405       i86    8d331c6533a476d4aa700ad803c548c7
 sha3sum_230312_x86_64.qpkg.md5       sha3sum_230312_x86_64.qpkg       sha3sum              230312       i64    6ceba9116e0dbcbdb4e6112f0c02f8c0
 sha3sum_230312_x86.qpkg.md5          sha3sum_230312_x86.qpkg          sha3sum              230312       i86    fdba9d16b88a5b6e3b04483ca77706dd
-sherpa_240405.qpkg.md5               sherpa_240405.qpkg               sherpa               240405       all    a5a9a67152f081d83d2d6f0e4ad8f78a
+sherpa_240406.qpkg.md5               sherpa_240406.qpkg               sherpa               240406       all    efe231e546f9d130310704c206facfe6
 SortMyQPKGs_240225.qpkg.md5          SortMyQPKGs_240225.qpkg          SortMyQPKGs          240225       all    44643edd1a10db13caa48a46f0a8d3c5
 Unrar_6.2.5_arm_64.qpkg.md5          Unrar_6.2.5_arm_64.qpkg          Unrar                6.2.5        a64    e2382b80908fc9549bbb00058968082a
 Unrar_6.2.5_arm-x41.qpkg.md5         Unrar_6.2.5_arm-x41.qpkg         Unrar                6.2.5        a41    ac1ff1149258db5e4c0b8165774eda37

support/sherpa-manager.source

@@ -45,11 +45,11 @@ Init()
 	UpdateColourisation
 	CMDs:Load
 	CMDs.IsOk || return
+	Traps:Set
 	Keystrokes:Hide
 	Cursor:Hide
 	Env:Load || return
 	LockFile:Claim || return
-	Traps:Set
 	Paths:Create || return
 	PrepareArgs
 	ParseManagementArgs || return