Don't use "hostname -s"

[ConfigScripts.git] / sys / profile

diff --git a/sys/profile b/sys/profile
index e673b016601fb6da6feee4bee7868f13a39dfc08..c18aa574d5d7aa540575e881f07af9c4227d421f 100644 (file)
--- a/sys/profile
+++ b/sys/profile
@@ -20,13 +20,12 @@ export UID
 export LC_MESSAGES="C"
 
 # Initialize PATH variable
-export PATH MANPATH
 if [ -x /usr/libexec/path_helper ]; then
-       PATH=""; MANPATH=""
        eval `/usr/libexec/path_helper -s`
 else
        PATH="/usr/local/bin:/usr/bin:/bin"
        [ "$UID" -eq 0 ] && PATH="/usr/local/sbin:/usr/sbin:/sbin:$PATH"
+       export PATH
 fi
 # prepend optional directories to PATH ...
 path=""
@@ -51,7 +50,7 @@ done
 [ -d ~/sbin ] && PATH=~/sbin:"${PATH}"
 
 # Setup MANPATH, if manpath(1) isn't available
-if [ ! "$(type manpath)" ]; then
+if [ ! "$(type manpath 2>/dev/null)" ]; then
        [ -z "$MANPATH" ] \
                && MANPATH="/usr/local/share/man:/usr/share/man:/usr/man"
        path=""
@@ -76,7 +75,7 @@ fi
 export UID USER
 
 # get my own hostname
-ME=`hostname -s`
+ME=`hostname 2>/dev/null`
 export ME
 
 # Move Xauthority file to local storage, so that sudo et all work
@@ -112,6 +111,25 @@ fi
        && PS1="<$ME> # " \
        || PS1="<$ME> \$ "
 
+# icalBuddy(1)
+type -p icalBuddy >/dev/null 2>&1
+if [ $? -eq 0 -a "$UID" -ne 0 ]; then
+       case "$LANG" in
+               *.UTF*) BUL="•"; SEP="»"; ;;
+               *)      BUL="*"; SEP=">"; ;;
+       esac
+       icalBuddy -f -n -npn -nc -b " $BUL " -ps "/ $SEP /" -eep "url,notes" \
+               eventsToday+1 | 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]"
+               [ $? -eq 0 ] && echo
+       fi
+fi
+
 # bash-specific initialization
 [ "$BASH" -a -z "$BASHRCREAD" -a -r /etc/bash.bashrc ] \
        && source /etc/bash.bashrc
@@ -123,7 +141,10 @@ fi
        && . /etc/ksh.kshrc
 
 # Check filesystem quotas
-which quota >/dev/null 2>&1
-[ $? -eq 0 ] && quota -q
+mount | grep quota >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+       which quota >/dev/null 2>&1
+       [ $? -eq 0 ] && quota -q
+fi
 
 # -eof-