Make sure the anti-recursive checks behave well

josephwecker · Aug 11, 2012 · 74237f6 · 74237f6
1 parent 3a10766
commit 74237f6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/bashrc_dispatch b/bashrc_dispatch
@@ -15,8 +15,10 @@
 
 EXPORT_FUNCTIONS=true
 
-[ -n "$SHELL_FOR" ] && [ $$ -eq "$SHELL_FOR" ] && exit  # Avoid recursive invocation
-SHELL_FOR=$$
+# Avoid recursive invocation
+[ -n "$BASHRC_DISPATCH_PID" ] && [ $$ -eq "$BASHRC_DISPATCH_PID" ] && exit
+BASHRC_DISPATCH_PID=$$
+
 
 SHELL_PLATFORM='OTHER'
 case "$MACHTYPE" in
@@ -56,3 +58,5 @@ unset fn_cmd
 [ -f "${HOME}/.bashrc_script" ]      && shell_is_script      && . "${HOME}/.bashrc_script"
 [ -f "${HOME}/.bashrc_interactive" ] && shell_is_interactive && . "${HOME}/.bashrc_interactive"
 [ -f "${HOME}/.bashrc_login" ]       && shell_is_login       && . "${HOME}/.bashrc_login"
+
+unset BASHRC_DISPATCH_PID