git://git.iain.cx/iain
/
profile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Process dependencies in subdirectories.
[profile.git]
/
.bash_profile
diff --git
a/.bash_profile
b/.bash_profile
index
56a1eb0
..
a89f59e
100644
(file)
--- a/
.bash_profile
+++ b/
.bash_profile
@@
-65,10
+65,14
@@
$deps"
# Source them all in the right order.
sourced=
for i in $deps; do
# 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.
done
# Maybe turn nocaseglob back on.
@@
-79,7
+83,7
@@
$deps"
# Reset LC_ALL.
LC_ALL=$lc_all
# 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.
unset lc_all nullglob nocg
# Don't inherit failure from the last script.