[merge] from unstable into stable

docs/QNAP-forum-announcement.bbcode

@@ -1,5 +1,5 @@
 [img]https://i.imgur.com/KTZ7xCy.png[/img]
-[b][u][size=150]sherpa: a mini-package-manager for QNAP NAS[/size][/u][/b]
+[img]https://i.imgur.com/xuSOM5A.png[/img] [b][u][size=150]sherpa: a mini-package-manager for QNAP NAS[/size][/u][/b]
 
 [url=https://github.com/OneCDOnly/sherpa/releases/latest][img]https://img.shields.io/github/v/release/OneCDOnly/sherpa?logo=github&label=latest%20release[/img][/url] [img]https://img.shields.io/badge/release_status-beta-orange?logo=github[/img] [img]https://img.shields.io/date/1494050732?logo=github&label=project%20launch[/img]
 
@@ -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]
 
-[img]https://i.imgur.com/UeSH8Zc.png[/img] [b][u][size=120]Installation[/size][/u][/b]
+[img]https://i.imgur.com/xuSOM5A.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]
-[img]https://i.imgur.com/UeSH8Zc.png[/img] [b][u][size=120]Usage[/size][/u][/b]
+[img]https://i.imgur.com/xuSOM5A.png[/img] [b][u][size=120]Usage[/size][/u][/b]
 [list]
 [*]At the command-prompt, run:
 [code]sudo sherpa[/code]

docs/README.md

@@ -1,5 +1,5 @@
-![icon](images/sherpa.readme.png)
-sherpa: a mini-package-manager for QNAP NAS
+![icon](images/sherpa.readme.png)<br>
+![#c5f015](images/lime.png) sherpa: a mini-package-manager for QNAP NAS
 ============================================
 [![Latest Release](https://img.shields.io/github/v/release/OneCDOnly/sherpa?logo=github&label=latest%20release)](https://github.com/OneCDOnly/sherpa/releases/latest) ![Static Badge](https://img.shields.io/badge/release_status-beta-orange?logo=github) ![Project Launch](https://img.shields.io/date/1494050732?logo=github&label=project%20launch)
 

support/sherpa-manager.source

@@ -4504,14 +4504,7 @@ DisplayAsStatusReportItemLine()
 	case $mode in
 		normal)
 			app_ver_msg+=$(QpkgGetApplVer "$qpkg_name")
-
-			if QPKGs-ISupgradable.Exist "$qpkg_name"; then
-				name_msg+=$(TextBrightOrange "$qpkg_name")
-				$TOUCH_CMD "$REPORT_FLAGS_PATH"/state-upgradable
-			else
-				name_msg+=$qpkg_name
-			fi
-
+			name_msg+=$qpkg_name
 			path_msg+=$(QpkgGetInstallationPath)
 
 			# Limit statuses to two words only.
@@ -4580,7 +4573,10 @@ DisplayAsStatusReportItemLine()
 			ver_msg+=$(TextBrightRed "$(QpkgGetInstalledVer)")
 	esac
 
-	QPKGs-ISupgradable.Exist "$qpkg_name" && ver_msg+=" ($(TextBrightOrange "$(QpkgGetAvailVer)"))"
+	if QPKGs-ISupgradable.Exist "$qpkg_name"; then
+		ver_msg+=" ($(TextBrightOrange "$(QpkgGetAvailVer)"))"
+		$TOUCH_CMD "$REPORT_FLAGS_PATH"/status-upgradable
+	fi
 
 	# column 1: package name
 
@@ -7096,11 +7092,11 @@ QPKGs.States:Build()
 	OsIsStopping && ShowAsWarn "$(OsGetQnapOS) is shutting-down and all QPKGs are stopping"
 
 	if OsIsLoadAverageInsane; then
-		ShowAsWarn 'the NAS currently has an exceptionally-high system-load, recommend aborting and trying again later'
+		ShowAsWarn 'the NAS has an exceptionally-high system-load, recommend aborting and trying again later'
 	elif OsIsLoadAverageHigh; then
-		ShowAsWarn 'the NAS currently has an unusually-high system-load, so this will take a while'
+		ShowAsWarn 'the NAS has an unusually-high system-load, so this may take a while'
 	elif OsIsLoadAverageElevated; then
-		ShowAsNote 'the NAS currently has an elevated system-load, this will take a little longer than usual'
+		ShowAsNote 'the NAS has an elevated system-load, so this may take a little longer than usual'
 	fi
 
 	ShowAsProc 'QPKG states'
@@ -7756,39 +7752,47 @@ IncludeReportFooter()
 	fi
 
 	if [[ -e "$REPORT_FLAGS_PATH"/state-disabled ]]; then
-		DisplayAsInfoIndentItem "$(TextBrightRed disabled)" "application won't start at bootup. Enable it first, then start it"
+		DisplayAsInfoIndentItem "$(TextBrightRed disabled)" "won't start at bootup. Enable it first, then start it"
 	fi
 
 	if [[ -e "$REPORT_FLAGS_PATH"/state-enabled ]]; then
-		DisplayAsInfoIndentItem "$(TextBrightGreen enabled)" 'application is started at bootup'
+		DisplayAsInfoIndentItem "$(TextBrightGreen enabled)" 'will start at bootup'
 	fi
 
 	if [[ -e "$REPORT_FLAGS_PATH"/state-inactive ]]; then
-		DisplayAsInfoIndentItem "$(TextBrightRed inactive)" 'application is dead or not-started. Try starting/activating it'
+		DisplayAsInfoIndentItem "$(TextBrightRed inactive)" 'is dead or not-started. Try starting/activating it'
 	fi
 
 	if [[ -e "$REPORT_FLAGS_PATH"/status-stopping ]]; then
-		DisplayAsInfoIndentItem "$(TextBrightOrange stopping)" 'application is stopping. Try checking again shortly'
+		DisplayAsInfoIndentItem "$(TextBrightOrange stopping)" 'is stopping. Try checking again shortly'
+	fi
+
+	if [[ -e "$REPORT_FLAGS_PATH"/status-upgradable ]]; then
+		DisplayAsInfoIndentItem "($(TextBrightOrange new))" 'an upgraded QPKG is available'
+	fi
+
+	if [[ -e "$REPORT_FLAGS_PATH"/status-unknown ]]; then
+		DisplayAsInfoIndentItem "$(TextBrightOrange unknown)" 'application status could not be determined'
 	fi
 
 	if [[ -e "$REPORT_FLAGS_PATH"/status-slow ]]; then
-		DisplayAsInfoIndentItem "$(TextBrightOrange slow)" 'application appears to be alive, but is slow to respond to the status request. Try checking again shortly' 		# More common on NAS with lower installed RAM, and usually because the application has been page-swapped to disk and must be reloaded into RAM.
+		DisplayAsInfoIndentItem "$(TextBrightOrange slow)" 'appears to be alive, but is slow to respond to the status request. Try checking again shortly' 		# More common on NAS with lower installed RAM, and usually because the application has been page-swapped to disk and must be reloaded into RAM.
 	fi
 
 	if [[ -e "$REPORT_FLAGS_PATH"/status-starting ]]; then
-		DisplayAsInfoIndentItem "$(TextBrightOrange starting)" 'application is starting. Try checking again shortly'
+		DisplayAsInfoIndentItem "$(TextBrightOrange starting)" 'is starting. Try checking again shortly'
 	fi
 
 	if [[ -e "$REPORT_FLAGS_PATH"/status-active ]]; then
-		DisplayAsInfoIndentItem "$(TextBrightGreen active)" "application is alive (and responsive if it's a daemon)"
+		DisplayAsInfoIndentItem "$(TextBrightGreen active)" "is alive (and responsive if it's a daemon)"
 	fi
 
 	if [[ -e "$REPORT_FLAGS_PATH"/app-dynamic ]]; then
-		DisplayAsInfoIndentItem dynamic 'application version is the latest available online'
+		DisplayAsInfoIndentItem dynamic 'version is the latest available online'
 	fi
 
 	if [[ -e "$REPORT_FLAGS_PATH"/app-final ]]; then
-		DisplayAsInfoIndentItem final 'application version is the last available'
+		DisplayAsInfoIndentItem final 'version is the last available'
 	fi
 
 	if [[ -e "$REPORT_FLAGS_PATH"/req-attention ]]; then
@@ -10315,7 +10319,6 @@ _QPKG:status_()
 	DebugVar z
 
 	# returncodes 124 and-up are generated by GNU 'timeout'.
-
 	case $z in
 		0)
 			SendPackageStateChange ISactive

workshop/ideas.txt

@@ -1,9 +1,7 @@
-* Add to 'status' report footer an explanation of "(new)".
+* Should reject useless action/group combinations like 'sherpa stop inactive'.
 
 * '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?