From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 16 Sep 2012 14:17:07 +0000 (+0100)
Subject: dot/bash_profile: Eliminate the already-run guard.
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/8523d7897d6e8a82c48d83cb191e9d3dfbd0eb74?ds=sidebyside

dot/bash_profile: Eliminate the already-run guard.

Debian's /etc/profile unconditionally sets the PATH to an unhelpful
thing.  If we don't run our profile again, the PATH will be left wrong.
So now we run unconditionally in login shells.  We should continue to
set the `__mdw_profile' flag variable, though, since this clues
`.bashrc' into running us if there's been no login shell since the
environment was cleared.
---

diff --git a/dot/bash_profile b/dot/bash_profile
index 27eec06..d61a7c3 100644
--- a/dot/bash_profile
+++ b/dot/bash_profile
@@ -2,9 +2,8 @@
 ###
 ### Bash startup things
 
-## Only do any of this if we haven't done it before.  Otherwise we
-## can have loops and lots of wasted time.
-if [ -z "$__mdw_profile" ]; then
+## The `.bashrc' hook will run us if it thinks we haven't been run before.
+## We should therefore let it know.
 export __mdw_profile=done
 
 ###--------------------------------------------------------------------------
@@ -286,9 +285,6 @@ fi
 ## If there's a local hook then run it.
 [ -f "$HOME/.profile-local" ] && . "$HOME/.profile-local"
 
-## End of the `__mdw_profile' guard.
-fi
-
 ## If we haven't run the `.bashrc' yet, and this shell is interactive, then
 ## run it now.
 [ -z "$__mdw_bashrc" ] && [ -t 0 ] && \