Make sure /usr/local/[s]bin is first when using path_helper

[ConfigScripts.git] / sys / profile

diff --git a/sys/profile b/sys/profile
index 423c3803e1177587dd2512dc8aaee5dc5b5dcdb0..8fac5d53d88108ed78e55533e784b9db6d10d71f 100644 (file)
--- a/sys/profile
+++ b/sys/profile
@@ -28,7 +28,11 @@ unset LC_CTYPE LC_encoding 2>/dev/null
 
 # Initialize PATH variable
 if [ -x /usr/libexec/path_helper ]; then
-       eval `/usr/libexec/path_helper -s`
+       eval `/usr/libexec/path_helper -s \
+               | sed "s|:/usr/local/bin||" | sed "s|:/usr/local/sbin||"`
+       [[ "$PATH" == *sbin* ]] \
+               && PATH="/usr/local/bin:/usr/local/sbin:$PATH" \
+               || PATH="/usr/local/bin:$PATH"
 else
        PATH="/usr/local/bin:/usr/bin:/bin"
        [ "$UID" -eq 0 ] && PATH="/usr/local/sbin:/usr/sbin:/sbin:$PATH"
@@ -48,7 +52,7 @@ if [ "$UID" -eq 0 ]; then
        [ -n "$path" ] && PATH="$path$PATH"
 fi
 # append optional directories to PATH ...
-for d in /usr/bin/X11 /usr/games; do
+for d in /usr/bin/X11 /usr/games /usr/share/php/bin; do
        [ -d "$d" -o -h "$d" ] && PATH="$PATH:$d"
 done
 # set PATH so it includes user's private executables