Make "bash_preexec_invoke_pre{cmd,exec}_functions" return the last non-zero exit status

Author: akinomyoga

bash-preexec.sh

@@ -151,11 +151,15 @@ __bp_precmd_invoke_cmd() {
 
 # This function invokes every function defined in our function array
 # "precmd_function".  This function receives the arguments $1 and $2 for $? and
-# $_, respectively, that will be set for the precmd functions.
+# $_, respectively, that will be set for the precmd functions. This function
+# returns the last non-zero exit status of the hook functions. If there is no
+# error, this function returns 0.
 bash_preexec_invoke_precmd_functions() {
     local lastexit=$1 lastarg=$2
     # Invoke every function defined in our function array.
     local precmd_function
+    local precmd_function_ret_value
+    local precmd_ret_value=0
     for precmd_function in "${precmd_functions[@]}"; do
 
         # Only execute this function if it actually exists.
@@ -164,8 +168,13 @@ bash_preexec_invoke_precmd_functions() {
             __bp_set_ret_value "$lastexit" "$lastarg"
             # Quote our function invocation to prevent issues with IFS
             "$precmd_function"
+            precmd_function_ret_value=$?
+            if [[ "$precmd_function_ret_value" != 0 ]]; then
+                precmd_ret_value="$precmd_function_ret_value"
+            fi
         fi
     done
+    return "$precmd_ret_value"
 }
 
 # Sets a return value in $?. We may want to get access to the $? variable in our
@@ -254,8 +263,8 @@ __bp_preexec_invoke_exec() {
         return
     fi
 
-    local preexec_ret_value
     bash_preexec_invoke_preexec_functions "${__bp_last_ret_value:-}" "$__bp_last_argument_prev_command" "$this_command"
+    local preexec_ret_value=$?
 
     # Restore the last argument of the last executed command, and set the return
     # value of the DEBUG trap to be the return code of the last preexec function
@@ -270,14 +279,14 @@ __bp_preexec_invoke_exec() {
 # "preexec_function".  This function receives the arguments $1 and $2 for $?
 # and $_, respectively, that will be set for the preexec functions.  The third
 # argument $3 specifies the user command that is going to be executed
-# (corresponding to BASH_COMMAND in the DEBUG trap).  This function assigns the
-# last non-zero exit status from the preexec functions to the variable
-# `preexec_ret_value`.  If there is no error, preexec_ret_value is set to `0`.
+# (corresponding to BASH_COMMAND in the DEBUG trap).  This function returns the
+# last non-zero exit status from the preexec functions.  If there is no error,
+# this function returns `0`.
 bash_preexec_invoke_preexec_functions() {
     local lastexit=$1 lastarg=$2 this_command=$3
     local preexec_function
     local preexec_function_ret_value
-    preexec_ret_value=0
+    local preexec_ret_value=0
     for preexec_function in "${preexec_functions[@]:-}"; do
 
         # Only execute each function if it actually exists.
@@ -292,6 +301,7 @@ bash_preexec_invoke_preexec_functions() {
             fi
         fi
     done
+    return "$preexec_ret_value"
 }
 
 __bp_install() {