X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.bash_profile;h=d2f4fc6e01d66fbfda501cadafd60aedbfbd1bba;hp=b8e11d4ec7146117735841abf67473f88186c7bb;hb=815c4966940595d1c924b0e01e82fe99fb1c4a29;hpb=328f2f42404cb5de71e06be1e44ddc1957a89800

diff --git a/.bash_profile b/.bash_profile
index b8e11d4..d2f4fc6 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