Skip to content

Commit

Permalink
[merge] from unstable into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
OneCDOnly committed Jun 5, 2024
2 parents 0d8859b + b6b7ead commit ba3eb22
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 19 deletions.
Binary file modified objects.tar.gz
Binary file not shown.
Binary file modified sherpa-manager.tar.gz
Binary file not shown.
32 changes: 13 additions & 19 deletions support/sherpa-manager.source
Original file line number Diff line number Diff line change
Expand Up @@ -1778,9 +1778,10 @@ ParseManagementArgs()
requires_group=true
user_action=$arg
;;
debug)
debug|verbose)
requires_group=false
user_action=$arg
EnableVerbose
EnableDebugToArchiveAndFile
;;
reset)
Expand All @@ -1789,12 +1790,6 @@ ParseManagementArgs()
DeleteSetting Terse

Reset # <-- Processing will terminate in this function (no-return).
;;
verbose)
requires_group=false
user_action=$arg
EnableVerbose
EnableDebugToArchiveAndFile
esac

if [[ -n $user_action && $user_action != "$current_action" ]]; then
Expand Down Expand Up @@ -3395,7 +3390,7 @@ IPKs:upgrade()
if [[ $z -eq 0 ]]; then
NoteIpkAcAsOk "$(IPKs-ACupgrade-to:Array)" upgrade
DebugAsDone "upgraded $desc"
SaveActionResultToLog IPK auxiliary upgrade "$total_count" ok "$z"
SaveActionResultToLog IPK auxiliary upgrade "$total_count" ok
else
NoteIpkAcAsEr "$(IPKs-ACupgrade-to:Array)" upgrade
SaveActionResultToLog IPK auxiliary upgrade "$total_count" failed "$z"
Expand Down Expand Up @@ -3475,7 +3470,7 @@ IPKs:install()
if [[ $z -eq 0 ]]; then
NoteIpkAcAsOk "$(IPKs-ACdownload-to:Array)" install
DebugAsDone "installed $desc"
SaveActionResultToLog IPK auxiliary install "$total_count" ok "$z"
SaveActionResultToLog IPK auxiliary install "$total_count" ok
HideKeystrokes
UpdateCapabilities

Expand Down Expand Up @@ -3572,7 +3567,7 @@ IPKs:downgrade()
((ok_count++))
NoteIpkAcAsOk "$(IPKs-ACdowngrade-to:Array)" downgrade
DebugAsDone "downgraded $desc"
SaveActionResultToLog IPK auxiliary downgrade "$ok_count" ok "$z"
SaveActionResultToLog IPK auxiliary downgrade "$ok_count" ok
else
((fail_count++))
NoteIpkAcAsEr "$(IPKs-ACdowngrade-to:Array)" downgrade
Expand Down Expand Up @@ -3641,7 +3636,7 @@ PIPs:install()
if [[ $z -eq 0 ]]; then
((ok_count++))
DebugAsDone "installed $desc"
SaveActionResultToLog PIP auxiliary install "$ok_count" ok "$z"
SaveActionResultToLog PIP auxiliary install "$ok_count" ok

rm -f "$PREV_PIP_LIST.installing" 2> /dev/null
else
Expand Down Expand Up @@ -6292,9 +6287,9 @@ Help.Options:Show()

Help.Basic:Show
DisplayAsHelpTitle "$(ShowAsOptions) usage examples:"
DisplayAsProjSynIndentExam 'show live debugging information, and record it to file' "$(ShowAsAction) $(ShowAsPackages) verbose"
DisplayAsProjSynIndentExam '' v
DisplayAsProjSynIndentExam 'record debugging information to file-only' "$(ShowAsAction) $(ShowAsPackages) debug"
DisplayAsProjSynIndentExam 'show debugging information, and record it to file' "$(ShowAsAction) $(ShowAsPackages) debug"
DisplayAsProjSynIndentExam '' "$(ShowAsAction) $(ShowAsPackages) verbose"
DisplayAsProjSynIndentExam '' "$(ShowAsAction) $(ShowAsPackages) v"

} > "$REPORT_OUTPUT_PATHFILE"

Expand Down Expand Up @@ -6350,7 +6345,6 @@ Help.Problems:Show()
DisplayAsProjSynIndentExam '' c
DisplayAsProjSynIndentExam 'clear local repository files from these QPKGs' "clean $(ShowAsPackages)"
DisplayAsProjSynIndentExam 'deactivate these QPKGs' "deactivate $(ShowAsPackages)"
DisplayAsProjSynIndentExam 'record debugging information to file-only' "$(ShowAsAction) $(ShowAsPackages) debug"
DisplayAsProjSynIndentExam "increase the default 'qpkg_service' timeouts from 3 minutes to 30 minutes" 'install increasetimeouts'
DisplayAsProjSynIndentExam "view only the most recent $(ShowAsTitleName) session log" last
DisplayAsProjSynIndentExam '' l
Expand All @@ -6361,8 +6355,9 @@ Help.Problems:Show()
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)"
DisplayAsProjSynIndentExam 'show live debugging information, and record it to file' "$(ShowAsAction) $(ShowAsPackages) verbose"
DisplayAsProjSynIndentExam '' v
DisplayAsProjSynIndentExam 'show debugging information, and record it to file' "$(ShowAsAction) $(ShowAsPackages) debug"
DisplayAsProjSynIndentExam '' "$(ShowAsAction) $(ShowAsPackages) verbose"
DisplayAsProjSynIndentExam '' "$(ShowAsAction) $(ShowAsPackages) v"
DisplayAsHelpTitleHighlighted "if you need help, please include a copy of your $(ShowAsTitleName) $(TextBrightOrange "log for analysis!")"

} > "$REPORT_OUTPUT_PATHFILE"
Expand Down Expand Up @@ -8692,10 +8687,9 @@ OsGetUptime()
UserGetTimeInShell()
{

local -i n=0
local n=''

[[ -n ${LOADER_SCRIPT_PPID:-} ]] && n=$($PS_CMD -o pid,etime | $GREP_CMD $LOADER_SCRIPT_PPID | head -n1)

FormatAsLongMinutesSecs "${n:6}"

}
Expand Down
2 changes: 2 additions & 0 deletions workshop/ideas.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
* Don't save action result code of '0' as reason.

* Arg parser should use commas to separate actions & options?

* Include QPKG "signed" status in dependencies report?
Expand Down
10 changes: 10 additions & 0 deletions workshop/issues.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
Observed issues:

* Lidarr (and Readarr) not running on x86-64:
-------------------------------------------------------------------------------------------------------------------------
[/share/Public] # cat /var/log/OLidarr.screen.log
command: 'export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 TMPDIR=/share/CACHEDEV1_DATA/.qpkg/OLidarr/tmp;/share/CACHEDEV1_DATA/.qpkg/OLidarr/repo-cache/Lidarr/Lidarr --nobrowser --data=/share/CACHEDEV1_DATA/.qpkg/OLidarr/config'
bash: /share/CACHEDEV1_DATA/.qpkg/OLidarr/repo-cache/Lidarr/Lidarr: No such file or directory
-------------------------------------------------------------------------------------------------------------------------

* When sherpa installs Entware (and now has a working sqlite3 binary), should also "sign" all installed QPKGs.
- For now, must run a 'check' to ensure it's signed.

* Near the end of installing IPKs, monitored download path can remain at non-zero size while packages complete installation.
- Include a separate progress message when dir size shrinks? Maybe force increase to "100%" and stop monitoring?

Expand Down

0 comments on commit ba3eb22

Please sign in to comment.