#
# Location of the XXXdirs files.
-DIR="$HOME/.PATH"
+DIR=${PROFILE_HOME:-~}/.PATH
# Paths to set and the file to get them from @variable to copy from.
PATHS="
C_INCLUDE_PATH:incdirs
CPLUS_INCLUDE_PATH:@C_INCLUDE_PATH
LD_LIBRARY_PATH:libdirs
-LD_RUN_PATH:@PATH
MANPATH:mandirs
PKG_CONFIG_PATH:pkgdirs
"
[ -z "$path" ] || eval "export $newpath='$path'"
}
+# Try to expand variables in a path definition, discarding it if expansion fails.
+function expandpath() {
+ local path="$1"; shift
+
+ while [ -n "$path" ]; do
+ [ "${path/\$/}" = "$path" ] && return 0
+ path="${path#*\$}"
+
+ local var="${path%%/*}"
+ eval "[ -n \"\$$var\" ] || return 1"
+ done
+
+ return 0
+}
+
+# Helper.
+function addpath() {
+ local path="$1"; shift
+ local dir="$1"; shift
+
+ if ! expandpath "$dir"; then
+ echo "$path"
+ else
+ dir=$(eval echo "$dir")
+ if [ -d "$dir" ]; then
+ echo "$path:$dir"
+ else
+ echo "$path"
+ fi
+ fi
+}
+
# Set a path from directories.
function makepath() {
local newpath="$1"; shift
# Read them.
local path=
while read dir; do
- local dir=$(eval echo "$dir")
- [ -d "$dir" ] || continue
-
- path="$path:$dir"
+ path=$(addpath "$path" "$dir")
+ if [ -n "$PROFILE_HOME" -a ! "${dir#\$HOME}" = "$dir" ]; then
+ dir="$PROFILE_HOME${dir#\$HOME}"
+ path=$(addpath "$path" "$dir")
+ fi
done < "$dirs"
# Restore IFS.
done
-unset DIR PATHS dir dirs path var source sanitisepath copypath makepath newpath setpaths
+unset DIR PATHS dir dirs path var source expandpath sanitisepath copypath makepath newpath addpath