#
# /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 ..."
[ -n "$UID" ] || UID=`id -u`
export UID
-# Set locale if it is not set or doesn't contain a dot;
-# but all system messages should still be in "native" ("C") language.
+# Indicates LC_CTYPE an UTF-8 terminal?
+[ -n "$LC_CTYPE" ] \
+ && LC_encoding="${LC_CTYPE#*.}" || LC_encoding="ISO8859-1"
+# Set locale if it is not set or doesn't contain a dot:
[ "$LANG" = "${LANG#*.}" -a "$LANG" != "C" ] \
- && export LANG="${LANG:-de_DE}.ISO8859-1"
-export LC_MESSAGES="C"
+ && export LANG="${LANG:-de_DE}.${LC_encoding}"
+# 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 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"
[ -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
# 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