core: silent() function - use return instead of exit to allow || true error handling (#13529)

This commit is contained in:
CanbiZ (MickLesk)
2026-04-05 21:02:56 +02:00
committed by GitHub
parent 05748eb1ed
commit 59c0052bc8
3 changed files with 40 additions and 46 deletions

View File

@@ -527,29 +527,23 @@ silent() {
fi
if [[ $rc -ne 0 ]]; then
# Source explain_exit_code if needed
if ! declare -f explain_exit_code >/dev/null 2>&1; then
if ! source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func); then
explain_exit_code() { echo "unknown (error_handler.func download failed)"; }
fi
fi
# Return instead of exit so that callers can use `$STD cmd || true`
# or `if $STD cmd; then ...` to handle errors gracefully.
# When no || / if is used, set -e + ERR trap will still catch it
# and error_handler() will display the error and exit.
#
# Set flag so error_handler knows to show log tail from silent's logfile
export _SILENT_FAILED_RC="$rc"
export _SILENT_FAILED_CMD="$cmd"
export _SILENT_FAILED_LINE="$caller_line"
export _SILENT_FAILED_LOG="$logfile"
local explanation
explanation="$(explain_exit_code "$rc")"
printf "\e[?25h"
msg_error "in line ${caller_line}: exit code ${rc} (${explanation})"
msg_custom "→" "${YWB}" "${cmd}"
if [[ -s "$logfile" ]]; then
echo -e "\n${TAB}--- Last 20 lines of log ---"
tail -n 20 "$logfile"
echo -e "${TAB}-----------------------------------"
echo -e "${TAB}📋 Full log: ${logfile}\n"
fi
exit "$rc"
return "$rc"
fi
# Clear stale flags on success (prevents false positives if a previous
# $STD cmd || true failed and a later non-silent command triggers error_handler)
unset _SILENT_FAILED_RC _SILENT_FAILED_CMD _SILENT_FAILED_LINE _SILENT_FAILED_LOG 2>/dev/null || true
}
# ------------------------------------------------------------------------------