Only setup MANPATH if manpath(1) is not available

[ConfigScripts.git] / sys / profile

diff --git a/sys/profile b/sys/profile
index ef07918d2ae1041c2ee687b30004e4de288991e0..e673b016601fb6da6feee4bee7868f13a39dfc08 100644 (file)
--- a/sys/profile
+++ b/sys/profile
@@ -9,9 +9,14 @@
 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#*.}" ] && export LANG="${LANG:-de_DE}.ISO8859-1"
+[ "$LANG" = "${LANG#*.}" -a "$LANG" != "C" ] \
+       && export LANG="${LANG:-de_DE}.ISO8859-1"
 export LC_MESSAGES="C"
 
 # Initialize PATH variable
@@ -25,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"
@@ -45,16 +50,18 @@ done
 [ -d ~/bin ] && PATH=~/bin:"${PATH}"
 [ -d ~/sbin ] && PATH=~/sbin:"${PATH}"
 
-# set MANPATH so it includes user's private man files
-if [ -n "$MANPATH" ]; then
+# Setup MANPATH, if manpath(1) isn't available
+if [ ! "$(type manpath)" ]; then
+       [ -z "$MANPATH" ] \
+               && MANPATH="/usr/local/share/man:/usr/share/man:/usr/man"
        path=""
        for d in /usr/pkg/share/man /usr/pkg/man /opt/*/share/man /opt/*/man; do
                [ -d "$d" -o -h "$d" ] && path="$path$d:"
        done
        [ -n "$path" ] && MANPATH="$path$MANPATH"
+       [ -d ~/share/man ] && MANPATH=~/share/man:"${MANPATH}"
+       [ -d ~/man ] && MANPATH=~/man:"${MANPATH}"
 fi
-[ -d ~/man ] && MANPATH=~/man:"${MANPATH}"
-[ -d ~/share/man ] && MANPATH=~/share/man:"${MANPATH}"
 
 # set variable identifying the chroot you work in
 [ -r /etc/debian_chroot ] && chroot_name=$(cat /etc/debian_chroot)
@@ -72,10 +79,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