From: Iain Patterson <me@iain.cx>
Date: Tue, 22 Jun 2010 13:45:42 +0000 (+0100)
Subject: Process dependencies in subdirectories.
X-Git-Url: http://git.iain.cx/?a=commitdiff_plain;h=b3abab8e9a298891172dc896672efe857410ae98;p=profile.git

Process dependencies in subdirectories.

This allows having, for example, a symlink to standard bashrc files
and local overrides.
---

diff --git a/.bash_profile b/.bash_profile
index 56a1eb0..a89f59e 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -65,10 +65,14 @@ $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.
@@ -79,7 +83,7 @@ $deps"
   # Reset LC_ALL.
   LC_ALL=$lc_all
 
-  unset i d n dep deps profile_d path required unsorted sourced
+  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.