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
Allow arbitrary shell expansion in *dirs.
[profile.git]
/
.profile.d
/
PATH.bashrc
diff --git
a/.profile.d/PATH.bashrc
b/.profile.d/PATH.bashrc
index
a7d4420
..
4c5d535
100644
(file)
--- a/
.profile.d/PATH.bashrc
+++ b/
.profile.d/PATH.bashrc
@@
-27,13
+27,23
@@
function makepath() {
# Check the file exists.
[ -e "$DIR/$dirs" ] || return
# Check the file exists.
[ -e "$DIR/$dirs" ] || return
+ # Set IFS to newline only so that we can read $(embedded shell commands).
+ JGD=$IFS
+ IFS='
+'
# Read them.
path=
for dir in $(cat "$DIR/$dirs"); do
# Read them.
path=
for dir in $(cat "$DIR/$dirs"); do
+ dir=$(eval echo "$dir")
[ -d "$dir" ] || continue
path="$path:$dir"
done
[ -d "$dir" ] || continue
path="$path:$dir"
done
+ unset dir
+
+ # Restore IFS.
+ IFS=$JGD
+ unset JGD
# Sanitise path.
path=${path#:}
# Sanitise path.
path=${path#:}
@@
-49,8
+59,8
@@
makepath PATH bindirs
makepath C_INCLUDE_PATH incdirs
copypath CPLUS_INCLUDE_PATH C_INCLUDE_PATH
makepath LD_LIBRARY_PATH libdirs
makepath C_INCLUDE_PATH incdirs
copypath CPLUS_INCLUDE_PATH C_INCLUDE_PATH
makepath LD_LIBRARY_PATH libdirs
-copypath LD_RUN_PATH
LD_LIBRARY_
PATH
+copypath LD_RUN_PATH PATH
makepath MANPATH mandirs
makepath PKG_CONFIG_PATH pkgdirs
makepath MANPATH mandirs
makepath PKG_CONFIG_PATH pkgdirs
-unset
sedscr makepath copy
path
+unset
dirs copypath makepath new
path