fix(direnv): set ERR trap after definition & before use

Also, fix the return code, which was making bash4 quite sad.

Author: bukzor

.envrc

@@ -6,15 +6,6 @@
 # If you'd like to override or set any custom environment variables, this .envrc will read a .env file at the end.
 set -e
 
-# Upgrading Mac can uninstall the Command Line Tools, thus, removing our access to git
-# The message talks about xcrun, however, we can use the lack of git as a way to know that we need this
-# xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools),
-# missing xcrun at: /Library/Developer/CommandLineTools/usr/bin/xcrun
-if [ "$(uname -s)" == "Darwin" ] && [ ! -f "/Library/Developer/CommandLineTools/usr/bin/git" ]; then
-    echo -e "$(tput setaf 1)\nERROR: Complete the interactive installation (10+ mins) of the Command Line Tools.$(tput sgr0)"
-    xcode-select --install
-    return 1
-fi
 
 SENTRY_ROOT="$(
     cd "$(dirname "${BASH_SOURCE[0]}")"
@@ -23,11 +14,6 @@ SENTRY_ROOT="$(
 
 source "${SENTRY_ROOT}/scripts/lib.sh"
 
-# XXX: we can't trap bash EXIT, because it'll override direnv's finalizing routines.
-#      consequently, using "exit" anywhere will skip this notice from showing.
-#      so need to use set -e, and return 1.
-trap notice ERR
-
 complete_success="yup"
 
 help_message() {
@@ -46,9 +32,10 @@ EOF
     help_message
 }
 
-notice() {
-    [ $? -eq 0 ] && return
+onerr() {
+    ret=$?
     failure_message
+    return $ret
 }
 
 debug() {
@@ -81,6 +68,21 @@ show_commands_info() {
 
 ### Environment ###
 
+# XXX: we can't trap bash EXIT, because it'll override direnv's finalizing routines.
+#      consequently, using "exit" anywhere will skip this notice from showing.
+#      so need to use set -e, and return 1.
+trap onerr ERR
+
+# Upgrading Mac can uninstall the Command Line Tools, thus, removing our access to git
+# The message talks about xcrun, however, we can use the lack of git as a way to know that we need this
+# xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools),
+# missing xcrun at: /Library/Developer/CommandLineTools/usr/bin/xcrun
+if [ "$(uname -s)" == "Darwin" ] && [ ! -f "/Library/Developer/CommandLineTools/usr/bin/git" ]; then
+    echo -e "${red}\nERROR: Complete the interactive installation (10+ mins) of the Command Line Tools.${reset}"
+    xcode-select --install
+    return 1
+fi
+
 commands_to_run=()
 
 # Always write stdout immediately. Very helpful for debugging