almost exit

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

lib/utility.bash

@@ -5,6 +5,7 @@ function blabla {
 
 function suite {
   exit 10
+  exit 0
   return 7
   echo $nope
   command_not_found