Run .profile.d scripts in the correct order.

[profile.git] / .bash_profile

diff --git a/.bash_profile b/.bash_profile
old mode 100755 (executable)
new mode 100644 (file)
index fcecf15..e061e9c
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,7 +1,15 @@
 # $Id$
-for i in ~/.profile.d/*.bashrc; do . $i; done
-__ps1
-
-if [ "$OSTYPE" = "cygwin" ]; then
-  shopt -s nocaseglob
+if $(tty -s) || [ "${0:0:1}" = "-" ]; then
+  # Remember if nocaseglob was on.
+  shopt -q nocaseglob
+  nocg=$?
+  # Turn it off so we source stuff in the right order.
+  shopt -u nocaseglob
+  # And set case-sensitive matching
+  LC_CTYPE=en_GB; LANG=
+  for i in ~/.profile.d/*.bashrc; do . $i; done; unset i
+  # Maybe turn it back on.
+  [ $nocg = 0 ] && shopt -s nocaseglob
+  unset nocg
+  __ps1
 fi