From c71342b837d969bfc6e05d22f587e076c212e553 Mon Sep 17 00:00:00 2001 From: pvincent Date: Fri, 10 Jul 2026 17:32:32 +0400 Subject: [PATCH] almost exit --- bin/bash-back | 21 ++++++++------------- lib/utility.bash | 1 + 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/bin/bash-back b/bin/bash-back index 3055e52..46ac893 100755 --- a/bin/bash-back +++ b/bin/bash-back @@ -14,19 +14,14 @@ function return { builtin return $code } -# # overridden function which permits stacktracing of original `return` statement -# function exit { -# code=${1:-0} -# if [[ $code -gt 0 ]]; then -# >/dev/stderr echo "${BASH_SOURCE[2]}: line ${BASH_LINENO[0]}: exit $@" -# on_exit $code -# builtin exit $code -# else -# success -# fi -# } - +# overridden function which permits stacktracing of original `return` statement function exit { + code=${1:-0} + >&2 echo "${BASH_SOURCE[2]}: line ${BASH_LINENO[0]}: exit $@" + builtin exit $code +} + +function on_exit { code=${1:-0} >&4 dump_stderr @@ -94,7 +89,7 @@ function cleanup { # MAIN set -TEue -o pipefail -trap 'exit $?' ERR TERM INT EXIT +trap 'on_exit $?' ERR TERM INT EXIT # magic FD exec 3>$TMP_ERROR 4>/dev/stderr diff --git a/lib/utility.bash b/lib/utility.bash index c8bbff5..56b2624 100644 --- a/lib/utility.bash +++ b/lib/utility.bash @@ -5,6 +5,7 @@ function blabla { function suite { exit 10 + exit 0 return 7 echo $nope command_not_found