X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.bash_profile;h=39276b9c900d2da244df5dc2ef36955b2b5f5d54;hb=eb32293ac0ef5fe79c5f240b0eaa4fc3f73f81ae;hp=5b49345763f318895512fdc87b5647de90211ce7;hpb=819bb88d5a014a23150b8fd609d194e883958674;p=profile.git

diff --git a/.bash_profile b/.bash_profile
index 5b49345..39276b9 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,4 +1,4 @@
-if $(tty -s) || [ "${0:0:1}" = "-" ]; then
+if tty -s || [ "${0:0:1}" = "-" -o "$1" = "force" ]; then
   # Remember if nocaseglob was on.
   shopt -q nocaseglob
   nocg=$?
@@ -11,7 +11,7 @@ if $(tty -s) || [ "${0:0:1}" = "-" ]; then
   LC_ALL=C
 
   # Source all scripts.
-  for i in ~/.profile.d/*.bashrc; do . $i; done; unset i
+  for i in ${PROFILE_HOME:-~}/.profile.d/*.bashrc; do . "$i"; done; unset i
 
   # Maybe turn nocaseglob back on.
   [ $nocg = 0 ] && shopt -s nocaseglob
@@ -20,5 +20,4 @@ if $(tty -s) || [ "${0:0:1}" = "-" ]; then
   LC_ALL=$lc_all
 
   unset lc_all nocg
-  __ps1
 fi