Fix PATH environment after plugins ran

[ax-zsh.git] / core / 30_path / 30_path.zprofile

diff --git a/core/30_path/30_path.zprofile b/core/30_path/30_path.zprofile
index 03490293ad85492718fe7c64ee0b6ba231da8e2e..a15e00620734499a6e67c0e80d22f401f3e9859c 100644 (file)
--- a/core/30_path/30_path.zprofile
+++ b/core/30_path/30_path.zprofile
@@ -8,39 +8,45 @@ else
        PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 fi
 typeset -Ux PATH
+typeset -U path
 
-# Prepend additional search paths
-for d (
-       /Developer/usr/bin
-       /usr/ucb
-       /usr/pkg/bin
-       /usr/local/bin
-       /usr/local/sbin
-       /opt/*/bin(NOn)
-       /opt/*/sbin(NOn)
-       /home/linuxbrew/.linuxbrew/bin
-       /home/linuxbrew/.linuxbrew/sbin
-       ~/.linuxbrew/bin
-       ~/.linuxbrew/sbin
-       ~/.gem/ruby/*/bin(NOn)
-       ~/.go/bin
-       ~/.cargo/bin
-       ~/.local/bin
-       ~/bin
-       ~/sbin
-       ~/Applications
-); do
-       [[ -d "$d" ]] && path=("$d" $path)
-done
+_axzsh_setup_path() {
+       # Prepend additional search paths
+       for d (
+               /Developer/usr/bin
+               /usr/ucb
+               /usr/pkg/bin
+               /usr/local/bin
+               /usr/local/sbin
+               /opt/*/bin(NOn)
+               /opt/*/sbin(NOn)
+               /home/linuxbrew/.linuxbrew/bin
+               /home/linuxbrew/.linuxbrew/sbin
+               ~/.linuxbrew/bin
+               ~/.linuxbrew/sbin
+               ~/.gem/ruby/*/bin(NOn)
+               ~/.go/bin
+               ~/.cargo/bin
+               ~/.local/bin
+               ~/bin
+               ~/sbin
+               ~/Applications
+       ); do
+               [[ -d "$d" ]] && path=("$d" $path)
+       done
+
+       # Append additional search paths
+       for d (
+               /usr/X11/bin
+               /usr/local/games
+               /usr/games
+       ); do
+               [[ -d "$d" ]] && path=($path "$d")
+       done
+}
 
-# Append additional search paths
-for d (
-       /usr/X11/bin
-       /usr/local/games
-       /usr/games
-); do
-       [[ -d "$d" ]] && path=($path "$d")
-done
+# Prepend and append search paths (in a special order!)
+_axzsh_setup_path
 
 # Set default MANPATH
 MANPATH="$(manpath -q)" 2>/dev/null
@@ -59,3 +65,4 @@ if [[ $? -ne 0 ]]; then
        done
 fi
 typeset -Ux MANPATH
+typeset -U manpath