[merge] from unstable into stable

docs/QNAP-forum-announcement.bbcode

@@ -14,15 +14,15 @@ That said: the majority of development is now complete, and I'm currently workin
 
 [b][size=120][url=https://github.com/OneCDOnly/sherpa/wiki/Packages]Click here for installable packages[/url][/size][/b]
 
-[b][u][size=120]Installation[/size][/u][/b]
+[img]https://i.imgur.com/UeSH8Zc.png[/img] [b][u][size=120]Installation[/size][/u][/b]
 
 [list]
 [*][url=https://www.qnap.com/en/how-to/faq/article/how-do-i-access-my-qnap-nas-using-ssh][b]SSH[/b][/url] into your NAS, and install the QPKG manually at the command-prompt:
 [code]curl -skL https://tinyurl.com/get-sherpa > /share/Public/sherpa.qpkg;
 sudo sh /share/Public/sherpa.qpkg;
 [/code]
 [/list]
-[b][u][size=120]Usage[/size][/u][/b]
+[img]https://i.imgur.com/UeSH8Zc.png[/img] [b][u][size=120]Usage[/size][/u][/b]
 [list]
 [*]At the command-prompt, run:
 [code]sudo sherpa[/code]

docs/README.md

@@ -13,13 +13,13 @@ Package management via **sherpa** provides features like easy application backup
 > 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 installable packages](https://github.com/OneCDOnly/sherpa/wiki/Packages)</b>
-## Installation
+## ![#c5f015](images/lime.png) Installation
 - [SSH](https://www.qnap.com/en/how-to/faq/article/how-do-i-access-my-qnap-nas-using-ssh) into your NAS, and install the QPKG manually at the command-prompt:
 ```
 curl -skL https://tinyurl.com/get-sherpa > /share/Public/sherpa.qpkg;
 sudo sh /share/Public/sherpa.qpkg;
 ```
-## Usage
+## ![#c5f015](images/lime.png) Usage
 - At the command-prompt, run:
 ```
 sudo sherpa

support/sherpa-manager.source

@@ -7080,9 +7080,8 @@ QPKGs.States:Build()
 
 	FuncInit
 
-	local previous=''
+	local a=''
 	local b=''
-	local c=''
 
 	if [[ ${qpkgs_states_built:=false} = true ]]; then
 		DebugAsDone "don't build states: they're already built"
@@ -7110,6 +7109,8 @@ QPKGs.States:Build()
 
 	# Faster to launch several concurrent loops in the background, than a single loop. Launch those requiring more processing-time first.
 
+	# This one should only be run when actioning 'installable' QPKGs.
+
 # 	time for qpkg_name in $(QPKGs-GRall:Array); do
 	for qpkg_name in $(QPKGs-GRall:Array); do
 		QpkgSetIndex
@@ -7172,6 +7173,8 @@ QPKGs.States:Build()
 # 	done #&
 	done &
 
+	# This one should only be run when actioning 'rebuild' or 'restore'.
+
 # 	time for qpkg_name in $(QPKGs-GRall:Array); do
 	for qpkg_name in $(QPKGs-GRall:Array); do
 		QpkgSetIndex
@@ -7189,10 +7192,10 @@ QPKGs.States:Build()
 	# Load status lines from individual files.
 
 	for qpkg_name in $(QPKGs-GRall:Array); do
-		c=/var/run/$qpkg_name.last.operation
+		a=/var/run/$qpkg_name.last.operation
 
-		if [[ -e $c ]]; then
-			case $(<$c) in
+		if [[ -e $a ]]; then
+			case $(<$a) in
 				start)
 					QPKGs-ISstarting:Add "$qpkg_name"
 					;;
@@ -7210,10 +7213,10 @@ QPKGs.States:Build()
 			esac
 		fi
 
-		c="$QPKG_STATES_PATH/$qpkg_name"
-		[[ -e $c ]] || continue
+		a=$QPKG_STATES_PATH/$qpkg_name
+		[[ -e $a ]] || continue
 
-		for b in $(<$c); do
+		for b in $(<$a); do
 			case $b in
 				backedup)
 					QPKGs-ISbackedup:Add "$qpkg_name"
@@ -7789,19 +7792,19 @@ IncludeReportFooter()
 	fi
 
 	if [[ -e "$REPORT_FLAGS_PATH"/req-attention ]]; then
-		DisplayAsIndentItem "'$(TextBrightOrange '*')' = QPKG cannot be installed"
+		DisplayAsIndentItem "'$(TextBrightOrange '*')' = QPKG cannot be installed."
 	fi
 
 	if [[ -e "$REPORT_FLAGS_PATH"/req-alert ]]; then
-		DisplayAsIndentItem "'$(TextBrightRed '!')' = QPKG is not working correctly"
+		DisplayAsIndentItem "'$(TextBrightRed '!')' = QPKG is not working correctly."
 	fi
 
 	if compgen -G "${REPORT_FLAGS_PATH}/backup-file-*" > /dev/null; then			# https://stackoverflow.com/a/6364244
 		DisplayAsIndentItem "backups are listed oldest-first."
 	fi
 
 	if [[ -e "$REPORT_FLAGS_PATH"/backup-file-old ]]; then
-		DisplayAsIndentItem "'$(TextBrightRed '!')' = QPKG backup file was updated more-than $highlight_backups_older_than"
+		DisplayAsIndentItem "'$(TextBrightRed '!')' = QPKG backup file was updated more-than $highlight_backups_older_than."
 	fi
 
 	if compgen -G "${REPORT_FLAGS_PATH}/backup-file-*" > /dev/null; then			# https://stackoverflow.com/a/6364244
@@ -11345,7 +11348,7 @@ QpkgIsUpgradable()
 
 	local a=${1:-${qpkg_name:?${FUNCNAME[0]}'()': undefined package name}}
 
-	QpkgIsInstalled "$a" && QpkgIsRepoOk "$a" && [[ $(QpkgGetInstalledVer "$a") != "$(QpkgGetAvailVer "$a")" ]] && QpkgIsArchOK "$a" && QpkgIsMinOSVerOk "$a" && QpkgIsMinRAMOk "$a"
+	QpkgIsInstalled "$a" && QpkgIsRepoOk "$a" && [[ $(QpkgGetInstalledVer "$a") != "$(QpkgGetAvailVer "$a")" ]] && QpkgIsArchOK "$a" && QpkgIsMinOSVerOk "$a" && QpkgIsMaxOSVerOk "$a" && QpkgIsMinRAMOk "$a"
 
 	}
 
@@ -11363,7 +11366,7 @@ QpkgIsInstallable()
 
 	[[ $qpkg_index -gt 0 && $qpkg_default_index -gt 0 ]] || return
 
-	! QpkgIsInstalled && QpkgIsRepoOk && QpkgIsArchOK && QpkgIsMinOSVerOk && QpkgIsMinRAMOk
+	! QpkgIsInstalled && QpkgIsRepoOk && QpkgIsArchOK && QpkgIsMinOSVerOk && QpkgIsMaxOSVerOk && QpkgIsMinRAMOk
 
 	}
 

workshop/ideas.txt

@@ -1,3 +1,9 @@
+* Add to 'status' report footer an explanation of "(new)".
+
+* 'status' report: show new QPKG application version alongside current application version.
+
+* Add 'unknown' as a possible status to status report information footer.
+
 * Service-scripts should shown current QPKG enabled state.
 
 * Report column headings in bright white?
@@ -6,23 +12,12 @@
 
 * Allow QPKGs to follow source git branch, release or tag.
 
-* Only install IPKs for QPKGs that download successfully (or are already downloaded).
-	- ... and the installed ones, as-happens now.
-
 * Add new arg to reshow the previously generated report.
 	- 'sherpa show report'.
 
 * Need a maintenance script to remove all but the most-recent QPKG builds.
 	- Should also run a 'git gc --aggressive' afterward.
 
-* Disable same-line display updates when not in a user terminal.
-	- No-need to record every progress message change in logs.
-
-* Default dependency report should only show installed QPKGs.
-	- ... but should allow 'sherpa d all' to see all QPKGs.
-	- Do the same for repository report.
-	- Add new $QPKG_ACTIONS element: 'report'
-
 * 'show results' report should include completion and elapsed times.
 
 * Make last action result a separate status report column?
@@ -75,9 +70,6 @@
 * Show results report in file viewport.
 	- Show status report in viewport too?
 
-* Results report wording should account for single QPKG actions.
-	- Don't pluralise "package actions" when there was only one.
-
 * QDK looks like it will now write installation scripts that extract to unique paths.
 	- Should now be able to install more than one QPKG simultaneously. https://github.com/qnap-dev/QDK/commit/f1eaf3bf0a9547d449592369e555cdfd6cc3c405
 	- It will take time for this ability to make its way into all QPKGs, so will need to note which QPKGs can be installed this way. 'packages' file will need an extra field to note this.

workshop/issues.txt

@@ -1,5 +1,19 @@
 Observed issues:
 
+	* Default dependency report should only show installed QPKGs.
+		- ... but should allow 'sherpa d all' to see all QPKGs.
+		- Do the same for repository report.
+		- Add new $QPKG_ACTIONS element: 'report'
+
+	* Disable same-line display updates when not in a user terminal.
+		- No-need to record every progress message change in logs.
+
+	* Only install IPKs for QPKGs that download successfully (or are already downloaded).
+		- ... and the installed ones, as-happens now.
+
+	* Results report wording should account for single QPKG actions.
+		- Don't pluralise "package actions" when there was only one.
+
 	* x86 (Sarah) is writing files into /root/.cache
 		-------------------------------------------------------------------------------------------------------------------------
 		[~] # du -h .cache/