[merge] from unstable into stable

support/sherpa-manager.source

@@ -863,7 +863,7 @@ DebugLogEnv()
 	DebugInfoMinSepr
 	RunAndLog '/usr/bin/free' "$RAM_FREEUSED_PATHFILE" '' 1
 	DebugInfoMinSepr
-	RunAndLog "$CAT_CMD /mnt/HDA_ROOT/.logs/kmsg | $GREP_CMD -i 'out of memory\|oom-killer'" "$OOM_LOG_PATHFILE" '' 1
+	RunAndLog "$GREP_CMD -i 'out of memory\|oom-killer' /mnt/HDA_ROOT/.logs/kmsg" "$OOM_LOG_PATHFILE" '' 1
 	DebugInfoMinSepr
 
 	FuncExit
@@ -962,7 +962,7 @@ CheckEnv()
 	local installed_ver=''
 	local target_packages=''
 
-	if [[ $($CAT_CMD /mnt/HDA_ROOT/.logs/kmsg | $GREP_CMD -i 'out of memory\|oom-killer' | $WC_CMD -l) -gt 0 ]]; then
+	if [[ $($GREP_CMD -i 'out of memory\|oom-killer' /mnt/HDA_ROOT/.logs/kmsg | $WC_CMD -l) -gt 0 ]]; then
 		ShowAsWarn "the $(TextBrightRed 'Out-Of-Memory killer') has been triggered ... check for $(TextBrightRed inactive) QPKGs"
 	fi
 
@@ -4601,7 +4601,7 @@ _DisplayAsStatusReportItemLine_()
 					in-progress)
 						action_msg+=" ($(TextBrightOrange $result))"
 						;;
-					failed)
+					aborted|failed)
 						action_msg+=" ($(TextBrightRed $result))"
 				esac
 			else
@@ -4655,7 +4655,7 @@ _DisplayAsStatusReportItemLine_()
 						in-progress)
 							action_msg+=" ($(TextBrightOrange $result))"
 							;;
-						failed)
+						aborted|failed)
 							action_msg+=" ($(TextBrightRed $result))"
 					esac
 				else
@@ -8036,6 +8036,10 @@ IncludeReportFooter()
 		DisplayAsIndentQuotedInfoItem "$(TextBrightRed disabled)" "QPKG won't start at bootup. Enable it first, then start it"
 	fi
 
+	if [[ -e "$REPORT_FLAGS_PATH"/result-aborted ]]; then
+		DisplayAsIndentQuotedInfoItem "($(TextBrightRed aborted))" 'last action was aborted'
+	fi
+
 	if [[ -e "$REPORT_FLAGS_PATH"/result-failed ]]; then
 		DisplayAsIndentQuotedInfoItem "($(TextBrightRed failed))" 'last action failed'
 	fi

support/vars.source

@@ -63,7 +63,7 @@ Project:
 #*	 https://git.io/sherpa
 #
 #* Forum:
-#*	 https://forum.qnap.com/viewtopic.php?f=320\&t=132373
+#*	 https://forum.qnap.com/viewtopic.php?t=132373
 EOB
 
 read -rd '' tested_msg << EOB

workshop/ideas.txt

@@ -1,3 +1,6 @@
+* When building status report, check if OOM killer has been active.
+	- Check killed pids against inactive daemons and report as-such.
+
 * Takes 3.5 to 6 seconds to build QPKG states on Laura.
 	- Should be able to do this quicker.
 	- Calculate QPKG features separate to states and cache/load these from file next time?

workshop/issues.txt

@@ -9,8 +9,6 @@ Observed issues:
 
 		-------------------------------------------------------------------------------------------------------------------------
 
-	* Create new switch for double-forked daemon processes? This should disable `screen` launching.
-
 	* If installed QPKGs are disabled, then upgraded, upgrade result is "failed".
 
 	* 'sherpa enable-auto-update active' is not running 'enable-auto-update' action.