community-scripts/ProxmoxVED
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing

Browse Source
This commit is contained in:
CanbiZ 2025-09-16 10:41:55 +02:00
parent 67ebb3782c
commit ba51df5bb1
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
misc/core.func
View File

@ -193,13 +193,17 @@ SILENT_LOGFILE="/tmp/silent.$$.log"
silent() { silent() {
local cmd="$*" local cmd="$*"
set +Eeuo pipefail
trap - ERR
"$@" >>"$SILENT_LOGFILE" 2>&1 "$@" >>"$SILENT_LOGFILE" 2>&1
local rc=$? local rc=$?
set -Eeuo pipefail trap 'error_handler' ERR
if [[ $rc -ne 0 ]]; then if [[ $rc -ne 0 ]]; then
error_handler "$rc" "$cmd" BASH_COMMAND="$cmd"
error_handler "$rc"
fi fi
return $rc return $rc
} }

4
misc/error_handler.func
View File

@ -85,6 +85,7 @@ error_handler() {
local command=${2:-${BASH_COMMAND:-unknown}} local command=${2:-${BASH_COMMAND:-unknown}}
local line_number=${BASH_LINENO[0]:-unknown} local line_number=${BASH_LINENO[0]:-unknown}
# clean up cosmetic STD variable
command="${command//\$STD/}" command="${command//\$STD/}"
if [[ "$exit_code" -eq 0 ]]; then if [[ "$exit_code" -eq 0 ]]; then
@ -95,7 +96,7 @@ error_handler() {
explanation="$(explain_exit_code "$exit_code")" explanation="$(explain_exit_code "$exit_code")"
printf "\e[?25h" printf "\e[?25h"
echo -e "\n${RD}[ERROR]${CL} in line ${RD}${line_number}${CL}: exit code ${RD}${exit_code}${CL} (${explanation}): while executing command ${YWB}${command}${CL}\n" echo -e "\n${RD}[ERROR]${CL} in line ${RD}${line_number}${CL}: exit code ${RD}${exit_code}${CL} (${explanation}): while executing command ${YW}${command}${CL}\n"
if [[ -n "${DEBUG_LOGFILE:-}" ]]; then if [[ -n "${DEBUG_LOGFILE:-}" ]]; then
{ {
@ -108,7 +109,6 @@ error_handler() {
} >>"$DEBUG_LOGFILE" } >>"$DEBUG_LOGFILE"
fi fi
# Silent-Log
if [[ -n "${SILENT_LOGFILE:-}" && -s "$SILENT_LOGFILE" ]]; then if [[ -n "${SILENT_LOGFILE:-}" && -s "$SILENT_LOGFILE" ]]; then
echo "--- Last 20 lines of silent log ($SILENT_LOGFILE) ---" echo "--- Last 20 lines of silent log ($SILENT_LOGFILE) ---"
tail -n 20 "$SILENT_LOGFILE" tail -n 20 "$SILENT_LOGFILE"