X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.bash_profile;h=6fe0759a4575e80ef646ccf8a3a6cca7a9082ba0;hp=b10aba7c53d96f2b1885dce6d7bbe7883da40d94;hb=546a2177e8c7dcda6895b25c5f4b0f6e83707e1d;hpb=75406151720cc055f10066c55e2a04bf044a9041

diff --git a/.bash_profile b/.bash_profile
index b10aba7..6fe0759 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,9 +1,14 @@
-if tty -s || [ "${0:0:1}" = "-" -o "$1" = "force" ]; then
+if [ -t 0 -o "${0:0:1}" = "-" -o "$1" = "force" ]; then
   # Remember if nocaseglob was on.
   shopt -q nocaseglob
   nocg=$?
   # Turn it off so we source stuff in the right order.
   shopt -u nocaseglob
+  # Remember if nullglob was on.
+  shopt -q nullglob
+  nullglob=$?
+  # Turn it on so we can look in subdirectories.
+  shopt -s nullglob
 
   # Remember LC_ALL.
   lc_all=$LC_ALL
@@ -23,7 +28,7 @@ BECOME.bashrc"
   profile_d=${PROFILE_HOME:-~}/.profile.d
   deps=
   unsorted=
-  for i in $profile_d/*.bashrc; do
+  for i in $profile_d/{*/,}*.bashrc; do
     dep=$(sed -n 's/^##*[ 	]*profile-required:[ 	]*//p' "$i")
     i="${i##$profile_d/}"
     if [ -n "$dep" ]; then
@@ -60,20 +65,26 @@ $deps"
   # Source them all in the right order.
   sourced=
   for i in $deps; do
-    [ -e "$profile_d/$i" ] || continue
-    [ "${sourced/ $i /}" = "$sourced" ] || continue
-    . "$profile_d/$i"
-    sourced="$sourced $i "
+    for j in $profile_d/{,*/}$i; do
+      [ -e "$j" ] || continue
+      k="${j##$profile_d/}"
+      [ "${sourced/ $k /}" = "$sourced" ] || continue
+      . "$j"
+      sourced="$sourced $k "
+      break
+    done
   done
 
   # Maybe turn nocaseglob back on.
   [ $nocg = 0 ] && shopt -s nocaseglob
+  # Maybe turn nullglob back off.
+  [ $nullglob = 0 ] || shopt -u nullglob
 
   # Reset LC_ALL.
   LC_ALL=$lc_all
 
-  unset i d n dep deps profile_d path required unsorted sourced
-  unset lc_all nocg
+  unset i j k d n dep deps profile_d path required unsorted sourced
+  unset lc_all nullglob nocg
 
   # Don't inherit failure from the last script.
   true