[merge] from unstable into stable

support/sherpa-manager.source

@@ -496,7 +496,7 @@ LocateSQLiteBinary()
 
 	# Prefer Entware-installed `sqlite3`.
 
-	if [[ -z ${sqlite_cmd:-} ]] && QpkgIsInstalled Entware; then
+	if [[ -z ${sqlite_cmd:-} ]] && QpkgIsReallyInstalled Entware; then
 		sqlite_pathfile=/opt/bin/sqlite3
 		[[ -e $sqlite_pathfile ]] && sqlite_cmd=$sqlite_pathfile
 	fi
@@ -506,12 +506,12 @@ LocateSQLiteBinary()
 	# These use a specific path to the binary:
 	#	HybridBackup = `Hybrid Backup Sync`
 
-	if [[ -z $sqlite_cmd ]] && QpkgIsInstalled HybridBackup; then
+	if [[ -z $sqlite_cmd ]] && QpkgIsReallyInstalled HybridBackup; then
 		sqlite_pathfile=$(QpkgGetInstalledPath HybridBackup)/CloudConnector3/bin/sqlite3
 		[[ -e $sqlite_pathfile ]] && sqlite_cmd=$sqlite_pathfile
 	fi
 
-	if [[ -z $sqlite_cmd ]] && QpkgIsInstalled ArchiwareP5; then	# untested.
+	if [[ -z $sqlite_cmd ]] && QpkgIsReallyInstalled ArchiwareP5; then	# untested.
 		sqlite_pathfile=$(QpkgGetInstalledPath ArchiwareP5)/binaries/Linux/unknown/64/sqlite3
 		[[ -e $sqlite_pathfile ]] && sqlite_cmd=$sqlite_pathfile
 	fi
@@ -521,7 +521,7 @@ LocateSQLiteBinary()
 
 	if [[ -z $sqlite_cmd ]]; then
 		for a in container-station HD_Station; do					# 'HD_Station' is untested.
-			if QpkgIsInstalled "$a"; then
+			if QpkgIsReallyInstalled "$a"; then
 				sqlite_pathfile=$(QpkgGetInstalledPath "$a")/usr/bin/sqlite3
 				[[ -e $sqlite_pathfile ]] || continue
 				sqlite_cmd=$sqlite_pathfile
@@ -534,8 +534,8 @@ LocateSQLiteBinary()
 	# 	qmiixagent = `Qmiix Agent`
 
 	if [[ -z $sqlite_cmd ]]; then
-		for a in CacheMount qmiixagent QPython312 QPython311 QPython39; do
-			if QpkgIsInstalled "$a"; then
+		for a in CacheMount qmiixagent qusbcam2 QPython312 QPython311 QPython39; do
+			if QpkgIsReallyInstalled "$a"; then
 				sqlite_pathfile=$(QpkgGetInstalledPath "$a")/bin/sqlite3
 				[[ -e $sqlite_pathfile ]] || continue
 				sqlite_cmd=$sqlite_pathfile
@@ -550,7 +550,7 @@ LocateSQLiteBinary()
 
 	if [[ -z $sqlite_cmd ]]; then
 		for a in img2pdf Qsirch OCR_Converter; do
-			if QpkgIsInstalled "$a"; then
+			if QpkgIsReallyInstalled "$a"; then
 				sqlite_pathfile=$(QpkgGetInstalledPath "$a")/bin/sqlite3
 				[[ -e $sqlite_pathfile ]] || continue
 				sqlite_cmd="LD_LIBRARY_PATH=$(QpkgGetInstalledPath "$a")/lib $sqlite_pathfile"
@@ -873,6 +873,7 @@ DebugLogEnv()
 	DebugScript 'git branch' "$useropt_branch"
 	DebugScript 'logs path' "$r_logs_path"
 	DebugScript 'action concurrency' "$r_concurrency"
+	DebugScript "'sqlite3' binary" "$sqlite_cmd"
 
 	if OsIsSupportUnofficialPackages; then
 		if OsIsAllowUnofficialPackages; then
@@ -9246,7 +9247,7 @@ QpkgGetArch()
 QpkgGetEntwareType()
 	{
 
-	if QpkgIsInstalled Entware; then
+	if QpkgIsReallyInstalled Entware; then
 		if [[ -e /opt/etc/passwd ]]; then
 			if [[ -L /opt/etc/passwd ]]; then
 				printf std

workshop/ideas.txt

@@ -1,5 +1,3 @@
-* Convert backup files report to autowidth.
-
 * 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.

workshop/issues.txt

@@ -1,5 +1,8 @@
 Observed issues:
 
+	* If IPK install stalls, seconds stalled display is not accurate.
+		- Need to calculate actual seconds elapsed since stall began, instead of using an accumulator and `sleep 1`.
+
 	* If an action fork fails (such as with "unbound variable" error), main loop stalls.
 		- Must save stderr to file, and exit main loop.