[merge] from unstable into stable

OneCDOnly · May 29, 2024 · 2823c75 · 2823c75
2 parents c4dc35b + 158f9b5
commit 2823c75
Show file tree

Hide file tree

Showing 4 changed files with 6 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
@@ -3553,15 +3553,15 @@ IPKs:downgrade()
 			url_suffix+=.ipk
 
 			for name in $(IPKs-ACdowngrade-to:Array); do
-				ShowAsPercentProgress "download $total_count ${package_type}$(Pluralise "$total_count")" '' "$ok_count" 0 0 "$total_count"
+				ShowAsPercentProgress "download $desc" '' "$ok_count" 0 0 "$total_count"
 				((ok_count++))
 
 				remote_url=${url_prefix}${name}${url_suffix}
 				local_pathfile=$IPK_DOWNGRADE_PATH/$($BASENAME_CMD "$remote_url")
 				RunAndLog "$CURL_CMD --location --output $local_pathfile $remote_url" "$log_pathfile" log:failure-only
 			done
 
-			ShowAsPercentProgress "download $total_count ${package_type}$(Pluralise "$total_count")" '' "$ok_count" 0 "$fail_count" "$total_count"
+			ShowAsPercentProgress "download $desc" '' "$ok_count" 0 "$fail_count" "$total_count"
 		fi
 
 		[[ ${useropt_terse:=true} = false && ${useropt_verbose:=false} = false ]] && echo
@@ -3574,7 +3574,7 @@ IPKs:downgrade()
 
 		ShowAsProc "downgrade $desc"
 
-		ShowAsPercentProgress "downgrade $total_count ${package_type}$(Pluralise "$total_count")" '' "$ok_count" 0 "$fail_count" "$total_count"
+		ShowAsPercentProgress "downgrade $desc" '' "$ok_count" 0 "$fail_count" "$total_count"
 		RunAndLog "$OPKG_CMD install --force-downgrade --cache $IPK_CACHE_PATH --tmp-dir $IPK_DOWNGRADE_PATH $IPK_DOWNGRADE_PATH/*.ipk" "$log_pathfile" log:failure-only
 		z=$?
 
@@ -3589,7 +3589,7 @@ IPKs:downgrade()
 			SaveActionResultToLog IPK auxiliary downgrade "$fail_count" failed "$z"
 		fi
 
-		ShowAsPercentProgress "downgrade $total_count ${package_type}$(Pluralise "$total_count")" '' "$ok_count" 0 "$fail_count" "$total_count"
+		ShowAsPercentProgress "downgrade $desc" '' "$ok_count" 0 "$fail_count" "$total_count"
 
 		[[ ${useropt_terse:=true} = false && ${useropt_verbose:=false} = false ]] && echo
 	fi
@@ -3644,7 +3644,7 @@ PIPs:install()
 		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"
 		desc="$total_count auxiliary PIP$(Pluralise "$total_count")"
 
-		ShowAsPercentProgress "install $total_count ${package_type}$(Pluralise "$total_count")" '' "$ok_count" 0 0 "$total_count"
+		ShowAsPercentProgress "install $desc" '' "$ok_count" 0 0 "$total_count"
 		RunAndLog "$exec_cmd" "$log_pathfile" log:failure-only
 		z=$?
 

diff --git a/support/vars.source b/support/vars.source
@@ -8,6 +8,7 @@ title_description='a mini-package-manager for QNAP NAS'
 
 checksum_root_path=$HOME/scripts/nas
 qpkgs_root_path=$HOME/scripts/nas/sherpa.packages
+	qpkgs_docs_path=$qpkgs_root_path/docs
 	qpkgs_path=$qpkgs_root_path/QPKGs
 	qpkgs_support_path=$qpkgs_root_path/support
 root_path=$HOME/scripts/nas/sherpa