Use "type -t" to test for tools.

[ConfigScripts.git] / sys / profile

diff --git a/sys/profile b/sys/profile
index fad0145bfae2922d08868b42ca9c87fd75b1690c..0943d22768eb8d16a50fa942a8ab4ea2fe7865ce 100644 (file)
--- a/sys/profile
+++ b/sys/profile
@@ -51,21 +51,22 @@ else
        export PATH
 fi
 # prepend optional directories to PATH ...
-path=""
+unset path
 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"
+unset path
 if [ "$LOGNAME" = "root" ]; then
-       path=""
        for d in /usr/pkg/sbin /opt/*/sbin; do
                if [ -d "$d" -o -h "$d" ]; then
                        [ -e "$d/.not_in_path" ] || path="$path$d:"
                fi
        done
        [ -n "$path" ] && PATH="$path$PATH"
+       unset path
 fi
 # append optional directories to PATH ...
 for d in /usr/bin/X11 /usr/games /usr/share/php/bin; do
@@ -73,6 +74,7 @@ for d in /usr/bin/X11 /usr/games /usr/share/php/bin; do
                [ -e "$d/.not_in_path" ] || PATH="$PATH:$d"
        fi
 done
+unset d
 # set PATH so it includes user's private executables
 [ -d ~/Applications -a ! -e ~/Applications/.not_in_path ] \
        && PATH=~/Applications:"${PATH}"
@@ -82,7 +84,7 @@ done
        && PATH=~/sbin:"${PATH}"
 
 # Setup MANPATH, if manpath(1) isn't available
-if [ ! "$(type manpath 2>/dev/null)" ]; then
+if [ ! "$(type -t manpath 2>/dev/null)" ]; then
        [ -z "$MANPATH" ] \
                && MANPATH="/usr/local/share/man:/usr/share/man:/usr/man"
        path=""
@@ -92,6 +94,7 @@ if [ ! "$(type manpath 2>/dev/null)" ]; then
        [ -n "$path" ] && MANPATH="$path$MANPATH"
        [ -d ~/share/man ] && MANPATH=~/share/man:"${MANPATH}"
        [ -d ~/man ] && MANPATH=~/man:"${MANPATH}"
+       unset path d
 fi
 
 # set variable identifying the chroot you work in
@@ -99,8 +102,8 @@ fi
 [ -r /etc/chroot_name ] && chroot_name=$(cat /etc/chroot_name)
 
 # get my own hostname
-ME=`hostname 2>/dev/null`
-export ME
+[ -n "$HOSTNAME" ] || HOSTNAME=`hostname 2>/dev/null`
+export HOSTNAME
 
 # Move Xauthority file to local storage, so that sudo et all work
 if [ -z "$XAUTHORITY" -a -r ~/.Xauthority ]; then
@@ -122,10 +125,11 @@ if [ -d /etc/profile.d -o -d /usr/local/etc/profile.d ]; then
                                . "$f"
                esac
        done
+       unset f
 fi
 
 # read local profile, if available
-[ -r "/var/lib/${ME}/profile" ] && . /var/lib/${ME}/profile
+[ -r "/var/lib/${HOSTNAME}/profile" ] && . /var/lib/${HOSTNAME}/profile
 
 # Setup some directories to use local storage (no NFS)
 [ -d "/usr/local/home/$LOGNAME" ] \
@@ -140,37 +144,39 @@ fi
 [ "$PS1" ] || return
 
 # validate terminal definition
-type -p tset >/dev/null 2>&1
-[ $? -eq 0 ] && eval `tset -s -Q`
+type -t tset >/dev/null && eval `tset -s -Q`
 
 # generic shell prompt
 [ "$LOGNAME" = "root" ] \
-       && PS1="<$ME> # " \
-       || PS1="<$ME> \$ "
-
-# icalBuddy(1)
-type -p icalBuddy >/dev/null 2>&1
-if [ $? -eq 0 -a "$LOGNAME" != "root" ]; then
-       case "$LANG" in
-               *.UTF*) bul="•"; bul_imp="!"; sep="»"; ;;
-               *)      bul="*"; bul_imp="!"; sep=">"; ;;
-       esac
-       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
-       if [ $? -eq 0 -a -r ~/.remind ]; then
-               remind -h -g -t5 ~/.remind | \
-                       grep -v '^Reminders for ' | grep -v '^$'
+       && PS1="<$HOSTNAME> # " \
+       || PS1="<$HOSTNAME> \$ "
+
+# Reminders (once every 60 minutes)
+if [ -z `find ~/.last_reminder -mmin -60 2>/dev/null` ]; then
+       [ -e ~/.ConfigScripts.debug ] && echo " - Reminders ..."
+       if [ "$(type -t icalBuddy >/dev/null)" -a "$LOGNAME" != "root" ]; then
+               # icalBuddy(1)
+               case "$LANG" in
+                       *.UTF*) bul="•"; bul_imp="!"; sep="»"; ;;
+                       *)      bul="*"; bul_imp="!"; sep=">"; ;;
+               esac
+               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)
+               if [ "$(type -t remind >/dev/null)" -a -r ~/.remind ]; then
+                       remind -h -g -t5 ~/.remind | \
+                               grep -v '^Reminders for ' | grep -v '^$'
+                       [ $? -eq 0 ] && echo
+               fi
        fi
+       touch ~/.last_reminder
 fi
 
 # bash-specific initialization
@@ -186,8 +192,7 @@ fi
 # Check filesystem quotas
 mount 2>/dev/null | grep quota >/dev/null 2>&1
 if [ $? -eq 0 ]; then
-       which quota >/dev/null 2>&1
-       [ $? -eq 0 ] && quota -q
+       type -t quota >/dev/null && quota -q
 fi
 
 # -eof-