Don't read /var/lib/$ME/bash.bashrc in non-interactive shells

[ConfigScripts.git] / sys / profile

diff --git a/sys/profile b/sys/profile
index ca7fd9844bee3d617a81ddb7202956f899528208..30e0df15db5b8f2662938cc3ec3669db1bfe8525 100644 (file)
--- a/sys/profile
+++ b/sys/profile
@@ -1,14 +1,24 @@
 #
 # /etc/profile: system-wide profile for the Bourne shell (sh(1)) and
 # Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
-# Written 2003-2008 by Alexander Barton (alex@barton.de)
+# Written 2003-2009 by Alexander Barton (alex@barton.de)
 #
 
-[ -e /tmp/ConfigDebug.$USER ] && echo " >> /etc/profile ..."
+[ -e ~/.ConfigScripts.debug ] && echo " >> /etc/profile ..."
 
 PROFILEREAD="true"
 export PROFILEREAD
 
+# Make sure UID is set
+[ -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.
+[ "$LANG" = "${LANG#*.}" -a "$LANG" != "C" ] \
+       && export LANG="${LANG:-de_DE}.ISO8859-1"
+export LC_MESSAGES="C"
+
 # Initialize PATH variable
 export PATH MANPATH
 if [ -x /usr/libexec/path_helper ]; then
@@ -20,7 +30,7 @@ else
 fi
 # prepend optional directories to PATH ...
 path=""
-for d in /usr/pkg/bin /opt/*/bin; do
+for d in /Developer/usr/bin /usr/pkg/bin /opt/*/bin; do
        [ -d "$d" -o -h "$d" ] && path="$path$d:"
 done
 [ -n "$path" ] && PATH="$path$PATH"
@@ -67,10 +77,25 @@ export UID USER
 ME=`hostname -s`
 export ME
 
+# Move Xauthority file to local storage, so that sudo et all work
+if [ -z "$XAUTHORITY" -a -r ~/.Xauthority ]; then
+       cp ~/.Xauthority /tmp/Xauthority-$USER
+       chmod 600 /tmp/Xauthority-$USER
+       export XAUTHORITY="/tmp/Xauthority-$USER"
+fi
+
 # read profile additions
 if [ -d /etc/profile.d ]; then
        for f in /etc/profile.d/*; do
-               [ -r "$f" ] && . "$f"
+               [ -r "$f" ] || continue
+               case "$f" in
+                       *.csh)
+                               ;;
+                       *)
+                               [ -e ~/.ConfigScripts.debug ] \
+                                       && echo " >> $f ..."
+                               . "$f"
+               esac
        done
 fi
 
@@ -95,7 +120,7 @@ fi
 [ "$KSH_VERSION" -a -z "$KSHRCREAD" -a -r /etc/ksh.kshrc ] \
        && . /etc/ksh.kshrc
 
-# Check quotas
+# Check filesystem quotas
 which quota >/dev/null 2>&1
 [ $? -eq 0 ] && quota -q