40_path: Reorder setting of PATH and MANPATH

This is required because manpath(1) requires a correctly set PATH
environment variable.

diff --git a/core/40_path/40_path.zprofile b/core/40_path/40_path.zprofile
index 59f9b751960b10b274981591538c8888d1baf5b6..45c18b4cc3319c90b59f49b2be57ac91331458f1 100644 (file)
--- a/core/40_path/40_path.zprofile
+++ b/core/40_path/40_path.zprofile
@@ -4,25 +4,25 @@
 # Set default PATH
 export PATH="/usr/bin:/bin:/usr/sbin:/sbin"
 
-# Set default MANPATH
-export MANPATH="$(manpath)" 2>/dev/null
-if [[ $? -ne 0 ]]; then
-       MANPATH="/usr/share/man"
-       for d (/usr/local/share/man /opt/*/man(N)); do
-               [ -d "$d" ] && MANPATH="$MANPATH:$d"
-       done
-fi
-
 # Prepend additional search paths
 for d (/usr/local/bin /usr/local/sbin ~/Applications(N)); do
-       [ -d "$d" ] && PATH="$d:$PATH"
+       [ -d "$d" ] && path=("$d" $path)
 done
 
 # Append additional search paths
 for d (/opt/*/sbin /opt/*/bin(N)); do
-       [ -d "$d" ] && PATH="$PATH:$d"
+       [ -d "$d" ] && path=($path "$d")
 done
 
+# Set default MANPATH
+export MANPATH="$(manpath)" 2>/dev/null
+if [[ $? -ne 0 ]]; then
+       MANPATH="/usr/share/man"
+       for d (/usr/local/share/man /opt/*/man(N)); do
+               [ -d "$d" ] && manpath=($manpath "$d")
+       done
+fi
+
 if [[ -x /usr/libexec/path_helper ]]; then
        # Update PATH using "path_helper(1)", when available
        eval "$(/usr/libexec/path_helper)"