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 bfebb1ff17adf311747638f26c349de6ff935226..8fac5d53d88108ed78e55533e784b9db6d10d71f 100644 (file)
--- a/sys/profile
+++ b/sys/profile
@@ -1,7 +1,7 @@
 #
 # /etc/profile: system-wide profile for the Bourne shell (sh(1)) and
 # Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
-# Written 2003-2011 by Alexander Barton (alex@barton.de)
+# Written 2003-2012 by Alexander Barton (alex@barton.de)
 #
 
 [ -e ~/.ConfigScripts.debug ] && echo " >> /etc/profile ..."
@@ -19,14 +19,20 @@ export UID
 # Set locale if it is not set or doesn't contain a dot:
 [ "$LANG" = "${LANG#*.}" -a "$LANG" != "C" ] \
        && export LANG="${LANG:-de_DE}.${LC_encoding}"
-# All system messages should still be in "native" ("C") language:
-export LC_MESSAGES="C"
+# All system messages should still be in "native" ("C") language for
+# non-X11 sessions:
+[ -z "$GDMSESSION" -a -z "$XDG_SESSION_COOKIE" ] \
+       && export LC_MESSAGES="C"
 # Clean up ...
-unset LC_CTYPE LC_encoding
+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"
@@ -46,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
@@ -139,7 +145,8 @@ else
        # remind(1)
        type -p remind >/dev/null 2>&1
        if [ $? -eq 0 -a -r ~/.remind ]; then
-               remind -h -g -t5 .remind | grep "^[0-9]"
+               remind -h -g -t5 ~/.remind | \
+                       grep -v '^Reminders for ' | grep -v '^$'
                [ $? -eq 0 ] && echo
        fi
 fi