#
# /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?
+if [ -n "$LC_CTYPE" ]; then
+ LC_encoding="${LC_CTYPE#*.}"
+else
+ case "$TERM" in
+ "xterm-"*)
+ LC_encoding="UTF-8"; ;;
+ *)
+ LC_encoding="ISO8859-1"
+ esac
+fi
+# 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"
fi
# prepend optional directories to PATH ...
path=""
-for d in /Developer/usr/bin /usr/pkg/bin /usr/lib/ccache /opt/*/bin; do
- [ -d "$d" -o -h "$d" ] && path="$path$d:"
+for d in /Developer/usr/bin /usr/pkg/bin /usr/ucb /usr/lib/ccache /opt/*/bin; do
+ if [ -d "$d" -o -h "$d" ]; then
+ [ -e "$d/.not_in_path" ] || path="$path$d:"
+ fi
done
[ -n "$path" ] && PATH="$path$PATH"
if [ "$UID" -eq 0 ]; then
path=""
for d in /usr/pkg/sbin /opt/*/sbin; do
- [ -d "$d" -o -h "$d" ] && path="$path$d:"
+ if [ -d "$d" -o -h "$d" ]; then
+ [ -e "$d/.not_in_path" ] || path="$path$d:"
+ fi
done
[ -n "$path" ] && PATH="$path$PATH"
fi
# append optional directories to PATH ...
-for d in /usr/bin/X11 /usr/games; do
- [ -d "$d" -o -h "$d" ] && PATH="$PATH:$d"
+for d in /usr/bin/X11 /usr/games /usr/share/php/bin; do
+ if [ -d "$d" -o -h "$d" ]; then
+ [ -e "$d/.not_in_path" ] || PATH="$PATH:$d"
+ fi
done
# set PATH so it includes user's private executables
-[ -d ~/Applications ] && PATH=~/Applications:"${PATH}"
-[ -d ~/bin ] && PATH=~/bin:"${PATH}"
-[ -d ~/sbin ] && PATH=~/sbin:"${PATH}"
+[ -d ~/Applications -a ! -e ~/Applications/.not_in_path ] \
+ && PATH=~/Applications:"${PATH}"
+[ -d ~/bin -a ! -e ~/bin/.not_in_path ] \
+ && PATH=~/bin:"${PATH}"
+[ -d ~/sbin -a ! -e ~/sbin/.not_in_path ] \
+ && PATH=~/sbin:"${PATH}"
# Setup MANPATH, if manpath(1) isn't available
if [ ! "$(type manpath 2>/dev/null)" ]; then
[ -r /etc/debian_chroot ] && chroot_name=$(cat /etc/debian_chroot)
[ -r /etc/chroot_name ] && chroot_name=$(cat /etc/chroot_name)
-# validate terminal definition
-[ -z "$TERM" ] && eval `tset -s -Q`
-
# make sure $UID and $USER is set
[ -z "$UID" ] && UID=`id -u`
[ -z "$USER" ] && USER=`id -un`
fi
# read profile additions
-if [ -d /etc/profile.d ]; then
- for f in /etc/profile.d/*; do
+if [ -d /etc/profile.d -o -d /usr/local/etc/profile.d ]; then
+ for f in /etc/profile.d/* /usr/local/etc/profile.d/*; do
[ -r "$f" ] || continue
case "$f" in
*.csh)
# Setup some directories to use local storage (no NFS)
[ -d "/usr/local/home/$USER" ] \
- || mkdir -p "/usr/local/home/$USER" >/dev/null 2>&1
+ || ( mkdir /usr/local/home; mkdir "/usr/local/home/$USER" ) >/dev/null 2>&1
if [ -w "/usr/local/home/$USER" ]; then
export LOCAL_HOME="/usr/local/home/$USER"
export CCACHE_DIR="$LOCAL_HOME/.ccache"
# interactive shell?
[ "$PS1" ] || return
+# validate terminal definition
+type -p tset >/dev/null 2>&1
+[ $? -eq 0 ] && eval `tset -s -Q`
+
# generic shell prompt
[ "$UID" -eq 0 ] \
&& PS1="<$ME> # " \
*) BUL="*"; SEP=">"; ;;
esac
icalBuddy -f -n -npn -nc -b " $BUL " -ps "/ $SEP /" -eep "url,notes" \
- eventsToday+1 | grep "$BUL"
+ eventsToday+1 2>/dev/null | grep "$BUL"
[ $? -eq 0 ] && echo
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