diff --git a/objects.tar.gz b/objects.tar.gz index 1818dcde4..286b8155b 100644 Binary files a/objects.tar.gz and b/objects.tar.gz differ diff --git a/sherpa-manager.tar.gz b/sherpa-manager.tar.gz index 747aba1b4..0e78c3c97 100644 Binary files a/sherpa-manager.tar.gz and b/sherpa-manager.tar.gz differ diff --git a/support/sherpa-manager.source b/support/sherpa-manager.source index 6cb0b4719..74500917a 100755 --- a/support/sherpa-manager.source +++ b/support/sherpa-manager.source @@ -748,13 +748,13 @@ DebugLogEnv() FuncInit ShowAsProc 'log env' + DebugInfoMinSepr if [[ $useropt_show_about = true || $useropt_show_aboutall = true ]]; then useropt_debug=true useropt_verbose=true fi - DebugInfoMinSepr DebugHardware ok 'NAS model' "$(get_display_name)" DebugHardware ok CPU "$(HardwareGetCPUInfo)" DebugHardware ok 'CPU cores' "$r_cpu_cores" @@ -890,22 +890,20 @@ DebugLogEnv() DebugQpkg detect "$(ShowAsPackageName IncreaseTimeouts)" N/A fi - DebugInfoMinSepr - if [[ $useropt_show_about = true ]]; then useropt_debug=false useropt_verbose=false return fi + [[ $useropt_show_aboutall = false ]] && DebugInfoMinSepr RunAndLog "/bin/df -h | /bin/grep '^Filesystem\|^none\|^tmpfs\|ram'" "$r_ramfs_freespace_pathfile" - DebugInfoMinSepr - RunAndLog "/usr/sbin/screen -ls" "$r_screen_sessions_pathfile" '' 1 - DebugInfoMinSepr + [[ $useropt_show_aboutall = false ]] && DebugInfoMinSepr + RunAndLog "/usr/sbin/screen -ls | /bin/sed '/^[[:space:]]*$/d'" "$r_screen_sessions_pathfile" '' 1 + [[ $useropt_show_aboutall = false ]] && DebugInfoMinSepr RunAndLog '/usr/bin/free' "$r_ram_freeused_pathfile" '' 1 - DebugInfoMinSepr + [[ $useropt_show_aboutall = false ]] && DebugInfoMinSepr RunAndLog "/bin/grep -i 'out of memory\|oom-killer' /mnt/HDA_ROOT/.logs/kmsg" "$r_oom_log_pathfile" '' 1 - DebugInfoMinSepr if [[ $useropt_show_aboutall = true ]]; then useropt_debug=false @@ -913,6 +911,8 @@ DebugLogEnv() return fi + DebugInfoMinSepr + FuncExit } @@ -2905,7 +2905,7 @@ ShowArgSuggestions() for arg in "${args_incomplete[@]}"; do case $arg in - ?(de|re)activate|backup|clean|@(dis|en)able|@(dis|en)able-auto-update|reassign|@(re|un)install|?(re)start|restore|rm|sign|stop|upgrade) + ?(de|re)activate|backup|clean|@(dis|en)able|@(dis|en)able-auto-update|reassign|@(re|un)install|?(re)start|restore|rm|sign|stop) DisplayAsProjSynExam "please provide valid $(ShowAsPackages) or a $(ShowAsPackageGroup) after '$arg' like" "$arg installed" arg_problem=true useropt_help_basic=false @@ -2953,6 +2953,11 @@ ShowArgSuggestions() arg_problem=true useropt_help_basic=false ;; + upgrade) + DisplayAsProjSynExam "please provide valid $(ShowAsPackages) or a $(ShowAsPackageGroup) after '$arg' like" "$arg new" + arg_problem=true + useropt_help_basic=false + ;; *) arg_problem=true args_remaining+=("$arg") @@ -4717,7 +4722,7 @@ GenerateStatusReportTitleLine() # column 3: package action and result printf "%$((r_report_column_spacing))s" - a='Previous action (result)' + a='Action (result)' printf "%-${r_report_qpkg_action_column_width}s" "$a:" # column 4: package version @@ -8055,7 +8060,7 @@ ShowReportStatuses() if OsIsSupportAutowidthTableColumns; then [[ $a = true ]] && b=" ($(TextBrightOrange new))" - printf -v c '\n%s\n' "QPKG name:|Status:|Previous action (result):|QPKG version${b}:|Appl. version:|Location:" + printf -v c '\n%s\n' "QPKG name:|Status:|Action (result):|QPKG version${b}:|Appl. version:|Location:" else printf -v c '\n%s\n' "$(GenerateStatusReportTitleLine)" fi diff --git a/workshop/issues.txt b/workshop/issues.txt index 6ed783528..aa5dfdb96 100644 --- a/workshop/issues.txt +++ b/workshop/issues.txt @@ -3,10 +3,6 @@ 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. - - set trap for SIGERR? - * Will need a new method to detect if QTS 5.2.0 is starting/stopping QPKGs due to async starts/stops. * Near the end of installing IPKs, monitored download path can remain at non-zero size while packages complete installation. @@ -22,14 +18,20 @@ Observed issues: - QPKG was 'skipped-abort', and is shown as 'skipped' in results. - TODO: Other QPKGs to be signed were not shown in either list. Must add them to 'skipped-abort' list. - * When aborting sherpa, must also ensure backgrounded procs abort. - - UPDATE: working fine, possibly won't need BG_PROCS_PATH anymore. Test to confirm. - * Function durations can become incorrect when functions with the same name are called recursively. - Need to make vars holding start-times unique. Maybe measure nest depth? Use epoch time in name? * QPKG version sort is not correctly sorting version numbers followed by an alpha as later than non-alpha. + # Action stalling + + * If an action fork fails (such as with "unbound variable" error), main loop stalls. + - Must save stderr to file, and exit main loop. + - set trap for SIGERR? + + * When aborting sherpa, must also ensure backgrounded procs abort. + - UPDATE: working fine, possibly won't need BG_PROCS_PATH anymore. Test to confirm. + # QTS/QuTS App Center * Removing OMedusa QPKG via sherpa didn't update App Center 'live' (icon remained until App Center was manually refreshed).