Fix test for "root" user

[ConfigScripts.git] / sys / profile

diff --git a/sys/profile b/sys/profile
index 72ea7a6292f23ce7bdc85646d239fd6f94b23c1c..fad0145bfae2922d08868b42ca9c87fd75b1690c 100644 (file)
--- a/sys/profile
+++ b/sys/profile
@@ -9,10 +9,6 @@
 PROFILEREAD="true"
 export PROFILEREAD
 
-# Make sure UID is set
-[ -n "$UID" ] || UID=`id -u`
-export UID
-
 # Setup locale and encoding
 if [ -e ~/.ConfigScripts.debug ]; then
        echo " - TERM=\"$TERM\""
@@ -39,10 +35,6 @@ fi
 [ "$LANG" = "${LANG#*.}" -a "$LANG" != "C" ] \
        && export LANG="${LANG:-de_DE}.${LC_encoding}"
 [ -e ~/.ConfigScripts.debug ] && echo " - LANG=\"$LANG\" (new)"
-# 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
 
@@ -55,7 +47,7 @@ if [ -x /usr/libexec/path_helper ]; then
                || PATH="/usr/local/bin:$PATH"
 else
        PATH="/usr/local/bin:/usr/bin:/bin"
-       [ "$UID" -eq 0 ] && PATH="/usr/local/sbin:/usr/sbin:/sbin:$PATH"
+       [ "$LOGNAME" = "root" ] && PATH="/usr/local/sbin:/usr/sbin:/sbin:$PATH"
        export PATH
 fi
 # prepend optional directories to PATH ...
@@ -66,7 +58,7 @@ for d in /Developer/usr/bin /usr/pkg/bin /usr/ucb /usr/lib/ccache /opt/*/bin; do
        fi
 done
 [ -n "$path" ] && PATH="$path$PATH"
-if [ "$UID" -eq 0 ]; then
+if [ "$LOGNAME" = "root" ]; then
        path=""
        for d in /usr/pkg/sbin /opt/*/sbin; do
                if [ -d "$d" -o -h "$d" ]; then
@@ -106,20 +98,15 @@ fi
 [ -r /etc/debian_chroot ] && chroot_name=$(cat /etc/debian_chroot)
 [ -r /etc/chroot_name ] && chroot_name=$(cat /etc/chroot_name)
 
-# make sure $UID and $USER is set
-[ -z "$UID" ] && UID=`id -u`
-[ -z "$USER" ] && USER=`id -un`
-export UID USER
-
 # get my own hostname
 ME=`hostname 2>/dev/null`
 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"
+       cp ~/.Xauthority /tmp/Xauthority-$LOGNAME
+       chmod 600 /tmp/Xauthority-$LOGNAME
+       export XAUTHORITY="/tmp/Xauthority-$LOGNAME"
 fi
 
 # read profile additions
@@ -141,10 +128,10 @@ fi
 [ -r "/var/lib/${ME}/profile" ] && . /var/lib/${ME}/profile
 
 # Setup some directories to use local storage (no NFS)
-[ -d "/usr/local/home/$USER" ] \
-       || ( 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"
+[ -d "/usr/local/home/$LOGNAME" ] \
+       || ( mkdir /usr/local/home; mkdir "/usr/local/home/$LOGNAME" ) >/dev/null 2>&1
+if [ -w "/usr/local/home/$LOGNAME" ]; then
+       export LOCAL_HOME="/usr/local/home/$LOGNAME"
        export CCACHE_DIR="$LOCAL_HOME/.ccache"
        export XDG_CACHE_HOME="$LOCAL_HOME/.cache"
 fi
@@ -157,20 +144,25 @@ type -p tset >/dev/null 2>&1
 [ $? -eq 0 ] && eval `tset -s -Q`
 
 # generic shell prompt
-[ "$UID" -eq 0 ] \
+[ "$LOGNAME" = "root" ] \
        && PS1="<$ME> # " \
        || PS1="<$ME> \$ "
 
 # icalBuddy(1)
 type -p icalBuddy >/dev/null 2>&1
-if [ $? -eq 0 -a "$UID" -ne 0 ]; then
+if [ $? -eq 0 -a "$LOGNAME" != "root" ]; then
        case "$LANG" in
-               *.UTF*) BUL="•"; SEP="»"; ;;
-               *)      BUL="*"; SEP=">"; ;;
+               *.UTF*) bul="•"; bul_imp="!"; sep="»"; ;;
+               *)      bul="*"; bul_imp="!"; sep=">"; ;;
        esac
-       icalBuddy -f -n -npn -nc -b " $BUL " -ps "/ $SEP /" -eep "url,notes" \
-               eventsToday+1 2>/dev/null | grep "$BUL"
+       icalBuddy -f -n -b " $bul " -ab " $bul_imp " -ps "/ $sep /" \
+               -nc -npn -iep "title,due" -stda \
+               tasksDueBefore:today 2>/dev/null
+       icalBuddy -f -n -b " $bul " -ab " $bul_imp " -ps "/ $sep /" \
+               -nc -npn -iep "title,datetime" \
+               eventsToday+1 2>/dev/null
        [ $? -eq 0 ] && echo
+       unset bul bul_imp sep
 else
        # remind(1)
        type -p remind >/dev/null 2>&1