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 Aug 17, 2024
2 parents c21afe3 + 652d97e commit 667fc0e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 12 deletions.
Binary file modified objects.tar.gz
Binary file not shown.
Binary file modified sherpa-manager.tar.gz
Binary file not shown.
12 changes: 6 additions & 6 deletions support/sherpa-manager.source
Original file line number Diff line number Diff line change
Expand Up @@ -7765,11 +7765,11 @@ GenerateReportFooter()
fi

if [[ -e "$REPORT_FLAGS_PATH"/result-aborted ]]; then
DisplayAsIndentQuotedInfoItem "($(TextBrightRed aborted))" 'last action was aborted'
DisplayAsIndentQuotedInfoItem "($(TextBrightRed aborted))" 'previous action was aborted'
fi

if [[ -e "$REPORT_FLAGS_PATH"/result-failed ]]; then
DisplayAsIndentQuotedInfoItem "($(TextBrightRed failed))" 'last action failed'
DisplayAsIndentQuotedInfoItem "($(TextBrightRed failed))" 'previous action failed'
fi

if [[ -e "$REPORT_FLAGS_PATH"/status-inactive ]]; then
Expand Down Expand Up @@ -7821,7 +7821,7 @@ GenerateReportFooter()
fi

if [[ -e "$REPORT_FLAGS_PATH"/result-ok ]]; then
DisplayAsIndentQuotedInfoItem "($(TextBrightGreen OK))" 'last action was successful'
DisplayAsIndentQuotedInfoItem "($(TextBrightGreen OK))" 'previous action was successful'
fi

if [[ -e "$REPORT_FLAGS_PATH"/status-active ]]; then
Expand Down Expand Up @@ -9574,7 +9574,7 @@ _QPKG:uninstall_()
z=$?

if [[ $z -eq 0 ]]; then
# ALERT: beware of `qpkg_cli --remove`, it removes the QPKG installation path around 10-20 seconds after execution. If sherpa has moved-on and starts an install, `qpkg_cli` will remove the newly created QPKG installation path partway through the installation. So, check if QPKG is to be installed: if this is the case, don't use `qpkg_cli --remove`.
# WARNING: beware of `qpkg_cli --remove`, it removes the QPKG installation path around 10-20 seconds after execution. If sherpa has moved-on and starts an install, `qpkg_cli` will remove the newly created QPKG installation path partway through the installation. So, check if QPKG is to be installed: if this is the case, don't use `qpkg_cli --remove`.
[[ -e /sbin/qpkg_cli ]] && ! QPKGs-ACinstall-to.Exist "$qpkg_name" && /sbin/qpkg_cli --remove "$qpkg_name" &> /dev/null
SaveActionResultToLog QPKG "$qpkg_name" uninstall '' ok
/sbin/rmcfg "$qpkg_name" -f /etc/config/qpkg.conf
Expand Down Expand Up @@ -10445,7 +10445,7 @@ ClearQpkgAppCenterNotifier()
QpkgServiceResultWasOk()
{

# Returns true if last action for this package is `ok`.
# Returns true if previous action for this package is `ok`.

# Input:
# $qpkg_name (global) = QPKG name
Expand Down Expand Up @@ -11243,7 +11243,7 @@ QpkgGetServiceAction()
# $qpkg_name (global, default) = target QPKG name.

# Output:
# $stdout = last action requested.
# $stdout = previous action requested.
# $? = 0 (found), !0 (not-found)

local a=${1:-${qpkg_name:?${FUNCNAME[0]}'()': undefined package name}}
Expand Down
2 changes: 0 additions & 2 deletions workshop/ideas.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
* Show currently selected git branch with 'enabled' and 'autoupdate' settings.

* 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.
Expand Down
4 changes: 0 additions & 4 deletions workshop/issues.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
Observed issues:

* Bazarr can take 4-5 minutes to start.
- 'start' shows as failed but daemon is running.
- Need to extend timeouts for this QPKG

* 'sherpa enable-auto-update active' is not running 'enable-auto-update' action.

* Near the end of installing IPKs, monitored download path can remain at non-zero size while packages complete installation.
Expand Down

0 comments on commit 667fc0e

Please sign in to comment.