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

And only add /usr/local/sbin when other sbin directories are
already included in the path_helper generated path.

diff --git a/sys/profile b/sys/profile
index 7a356c101232bcfce467e06ae1a434092443cc69..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"