[merge] from unstable into stable

OneCDOnly · Jun 7, 2024 · cf3d7ad · cf3d7ad
2 parents c4309aa + b4d36f9
commit cf3d7ad
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 23 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
@@ -10451,7 +10451,7 @@ _QPKG:sign_()
 	a="INSERT INTO Certificate (Type,QpkgName,Cert,DigitalSignature) VALUES ('qpkg','$qpkg_name','$QPKG_CERTIFICATE','$QPKG_SIGNATURE');"
 
 	for ((retries=0; retries<10; retries++)); do
-		eval "$sqlite_cmd" "$CERT_DB_PATHFILE" \"$a\"
+		eval "$sqlite_cmd" "$CERT_DB_PATHFILE" "\"$a\""
 		z=$?
 
 		case $z in
@@ -11856,8 +11856,8 @@ EOB
 	# This digital signature block is the same used by QNAP for LicenseCenter.
 	read -r -d '' QPKG_SIGNATURE << EOB
 MIME-Version: 1.0
-Content-Disposition: attachment; filename="smime.p7m"
-Content-Type: application/pkcs7-mime; smime-type=signed-data; name="smime.p7m"
+Content-Disposition: attachment; filename=\"smime.p7m\"
+Content-Type: application/pkcs7-mime; smime-type=signed-data; name=\"smime.p7m\"
 Content-Transfer-Encoding: base64
 
 MIIGtAYJKoZIhvcNAQcCoIIGpTCCBqECAQExDTALBglghkgBZQMEAgEwIwYJKoZI

diff --git a/workshop/ideas.txt b/workshop/ideas.txt
@@ -1,3 +1,23 @@
+* 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?
+
+* 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.
+
+* If service script is unable to update repo/download release file, and there isn't already an installation, then abort immediately.
+
+* 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'
+
+* When running 'sherpa rebuild sab', SAB is installed and auto-updates as usual. Then when 'restore' action runs, auto-update runs again.
+	- Disable auto-update after installation if 'restore' is to be run, then enable it again after 'restore' completes.
+
 * Arg parser should use commas to separate actions & options?
 
 * Include QPKG "signed" status in dependencies report?
@@ -84,6 +104,7 @@
 
 * Create local sherpa App Center repository in UI.
 	- Place sherpa.xml in /home/httpd and add a 3rd-party repo to App Center with 'http://0.0.0.0:8080/sherpa.xml'
+	- Hide this repo in App Center, to prevent user installs via UI? Must check if this can be done. If can't hide, prohibit icon installs?
 
 * Compare .git/ORIG_HEAD before-and-after 'git pull'. If different, then remove *.pyc before starting application.
 

diff --git a/workshop/issues.txt b/workshop/issues.txt
@@ -1,7 +1,5 @@
 Observed issues:
 
-	* If service script is unable to update repo/download release file, and there isn't already an installation, then abort immediately.
-
 	* Lidarr (and Readarr) not running on x86-64:
 		-------------------------------------------------------------------------------------------------------------------------
 		[/share/Public] # cat /var/log/OLidarr.screen.log
@@ -43,28 +41,10 @@ Observed issues:
 			# sherpa show results
 		-------------------------------------------------------------------------------------------------------------------------
 
-	* When running 'sherpa rebuild sab', SAB is installed and auto-updates as usual. Then when 'restore' action runs, auto-update runs again.
-		- Disable auto-update after installation if 'restore' is to be run, then enable it again after 'restore' completes.
-
-	* 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?
-
 	* Applications sourced online are not updating (e.g. Tautulli).
 		- Had to 'clean' it to get latest version pulled.
 		- Forgot to check: was auto-update disabled? Retest.
 
-	* 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.
-
 	* 'sherpa' and 'opkg' were not available after installing Entware.
 		- Entware installation may be corrupt.
 		- But this shouldn't affect the sherpa command `/usr/sbin/sherpa`.