[merge] from unstable into stable

OneCDOnly · Nov 8, 2024 · 8fc4487 · 8fc4487
2 parents 3a8262c + 255ef13
commit 8fc4487
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 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
@@ -6333,7 +6333,7 @@ ShowHelpBasicExamples()
 
 		DisplayAsProjSynIndentExam "to see available $(ShowAsAction)s" 'help actions'
 		DisplayAsProjSynIndentExam "to see available $(ShowAsPackages)" 'show packages'
-		DisplayAsProjSynIndentExam '' p
+# 		DisplayAsProjSynIndentExam '' p
 		DisplayAsProjSynIndentExam "to see available $(ShowAsPackageGroup)s" 'help groups'
 		DisplayAsProjSynIndentExam "or, for more $(ShowAsOptions)" 'help options'
 		DisplayAsHelpTitle "more in the wiki: $(ShowAsURL 'https://github.com/OneCDOnly/sherpa/wiki')"
@@ -6548,7 +6548,7 @@ ShowHelpProblems()
 		DisplayAsProjSynIndentExam "view the entire $(ShowAsTitleName) session log" log
 		DisplayAsProjSynIndentExam "upload the most-recent session in your $(ShowAsTitleName) log to the $(ShowAsURL 'https://termbin.com') public pastebin. A URL will be generated afterward" 'paste last'
 		DisplayAsProjSynIndentExam "upload the most-recent $(FormatAsThous "$r_log_tail_lines") lines in your $(ShowAsTitleName) log to the $(ShowAsURL 'https://termbin.com') public pastebin. A URL will be generated afterward" 'paste log'
-		DisplayAsProjSynIndentExam 'reactivate installed QPKGs (upgrades internal applications where-supported)' 'reactivate all'
+		DisplayAsProjSynIndentExam 'reactivate installed QPKGs (upgrade internal applications where-supported)' 'reactivate all'
 		DisplayAsProjSynIndentExam "remove all cached $(ShowAsTitleName) items and logs" reset
 		DisplayAsProjSynIndentExam 'find the live status of each application in these QPKGs' "status $(ShowAsPackages)"
 		DisplayAsProjSynIndentExam '' "s $(ShowAsPackages)"
@@ -12700,6 +12700,15 @@ QpkgIsInstalledEnabled()
 
 	}
 
+QpkgIsSigned()
+	{
+
+	# TODO: include SQL to check $1/$qpkg_name has been signed in certificate database. Use Python modules for this instead of SQLite3 executable.
+
+	:
+
+	}
+
 CreatePidFile()
 	{
 
@@ -12858,7 +12867,7 @@ ClearPath()
 	{
 
 	# Clear (empty) an existing directory, but don't delete the directory.
-	# Delete files in a relatively safe manner. Parent of directory MUST be specified to avoid an `rm -rf /*` situation because of empty args.
+	# Delete files in a relatively safe manner. Parent of directory MUST be separately specified to avoid an `rm -rf /*` situation because of empty args.
 
 	# Inputs: (local)
 	#	$1 = full path to parent of directory name to clear.

diff --git a/workshop/ideas.txt b/workshop/ideas.txt
@@ -1,3 +1,6 @@
+* Include QPKG signing method via default QTS Python and modules.
+	- Won't require an sqlite binary.
+
 * Display warning when sherpa QPKG is not signed, and QTS App Center requires signed packages only.
 
 * Put 'sherpa about' display into a report window.

diff --git a/workshop/issues.txt b/workshop/issues.txt
@@ -1,13 +1,5 @@
 Observed issues:
 
-	* `sherpa stop deps disable deps` yields:
-		--------------------------------------------------------------------------------------------------
-		• These package actions were skipped (and why):
-			deactivate ClamAV QPKG (incompatible author)
-			disable ClamAV QPKG (incompatible author)
-		--------------------------------------------------------------------------------------------------
-		... although, no ClamAV QPKG is installed.
-
 	* Service-script daemon PID shown twice consecutively during 'clean' action:
 		--------------------------------------------------------------------------------------------------
 		[/share/Public] # /etc/init.d/sabnzbd.sh clean