X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.bash_profile;h=d2f4fc6e01d66fbfda501cadafd60aedbfbd1bba;hp=d0db134f18d97ef5c0aa351609f1767f1fb330cb;hb=b139e97ef925c1d1f9922d9a2b55d5d8b7e49ab0;hpb=ce9edf7e8f698652648a508547a0ac56217dfe1b diff --git a/.bash_profile b/.bash_profile index d0db134..d2f4fc6 100644 --- a/.bash_profile +++ b/.bash_profile @@ -1,5 +1,4 @@ -# $Id$ -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=$? @@ -12,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