[merge] from unstable into stable

OneCDOnly · Aug 24, 2024 · de53ce8 · de53ce8
2 parents 860e1ba + 92772be
commit de53ce8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/objects.tar.gz b/objects.tar.gz
diff --git a/sherpa-manager.tar.gz b/sherpa-manager.tar.gz
diff --git a/support/sherpa-manager.source b/support/sherpa-manager.source
@@ -3718,7 +3718,7 @@ PIPs:install()
 
 		((total_count++))
 
-		exec_cmd="$PIP_CMD install --upgrade --no-input $(PIPs-ACinstall-to:List) --cache-dir $PIP_CACHE_PATH 2> >($GREP_CMD -v \"Running pip as the 'root' user\") >&2"
+		exec_cmd="$PIP_CMD install --upgrade --no-input $(PIPs-ACinstall-to:List) --cache-dir $PIP_CACHE_PATH --root-user-action=ignore"
 		desc="$total_count auxiliary PIP$(Pluralise "$total_count")"
 
 		ShowAsPercentProgress "install $desc" '' "$ok_count" 0 0 "$total_count"

diff --git a/workshop/construct-dep-line.sh b/workshop/construct-dep-line.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+for a in $(grep '^\[.*\]$' qpkg.conf | sed 's|\[||;s|\]||;/RunLast/d'); do
+	[[ -n $b ]] && b+=":$a" || b=$a
+done
+
+echo "$b"
diff --git a/workshop/ideas.txt b/workshop/ideas.txt
@@ -1,3 +1,5 @@
+* Don't attempt to 'sign' QPKGs after install on unsupported firmware (<4.3.5)
+
 * Check OOM killed pids against inactive daemons and report as-such on status report.
 
 * Takes 3.5 to 6 seconds to build QPKG states on Laura.
@@ -57,8 +59,6 @@
 
 * BASH completion.
 
-* Service-scripts should show current auto-update setting when displaying basic help.
-
 * Automate generation of 'Packages.md' in wiki using details from 'packages.source' ?
     - Would need to store full application description, port numbers, application source.
     - Maybe consider another local source file, that builds 'packages.source' first?

diff --git a/workshop/issues.txt b/workshop/issues.txt
@@ -2,8 +2,8 @@ Observed issues:
 
 	* Will need a new method to detect if QTS 5.2.0 is still starting QPKGs due to async starts.
 
-	* Need sherpa to determine the diff between sherpa ClamAV QPKG and the new QNAP ClamAV QPKG so it knwos when to ignore the new one.
-		- Maybe check installed QPKG author in qpkg.conf?
+	* Need sherpa to determine the diff between sherpa ClamAV QPKG and the new QNAP ClamAV QPKG so it knows when to ignore the new one.
+		- Maybe compare installed QPKG authors (in qpkg.conf) against packages file?
 
 	* 'sherpa enable-auto-update active' is not running 'enable-auto-update' action.