X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.profile.d%2FPATH.bashrc;h=fa7fa01ef2b97cc4acfa9b4d90e977c6c3bd12f8;hp=a7d44205bae2f8480e61479bf08141aaca185d02;hb=819bb88d5a014a23150b8fd609d194e883958674;hpb=104b025d33b8cf5f9d42bda3ac3d158eb7a07701

diff --git a/.profile.d/PATH.bashrc b/.profile.d/PATH.bashrc
index a7d4420..fa7fa01 100644
--- a/.profile.d/PATH.bashrc
+++ b/.profile.d/PATH.bashrc
@@ -1,5 +1,3 @@
-# $Id$
-#
 # Path information is stored on separate lines in XXXdirs.
 # We extract each directory exists and add it to the appropriate PATH.
 #
@@ -27,13 +25,23 @@ function makepath() {
   # 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
+  while read dir; do
+    dir=$(eval echo "$dir")
     [ -d "$dir" ] || continue
 
     path="$path:$dir"
-  done
+  done < "$DIR/$dirs"
+  unset dir
+
+  # Restore IFS.
+  IFS=$JGD
+  unset JGD
 
   # Sanitise path.
   path=${path#:}
@@ -49,8 +57,8 @@ makepath PATH bindirs
 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
 
-unset sedscr makepath copypath
+unset dirs copypath makepath newpath