X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sys%2Fprofile;h=7471952b9e53080de3c7cc178d3b58ca590abc60;hb=32fbf942911c1aeb131ab777a1212ea7098aef67;hp=08307cb9643ac36ddcdbd2528f805764f670daaf;hpb=6c5c1f890597543ad1c3eb7fb510584a46a61be1;p=ConfigScripts.git

diff --git a/sys/profile b/sys/profile
index 08307cb..7471952 100644
--- a/sys/profile
+++ b/sys/profile
@@ -1,7 +1,7 @@
 #
 # /etc/profile: system-wide profile for the Bourne shell (sh(1)) and
 # Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
-# Written 2003-2009 by Alexander Barton (alex@barton.de)
+# Written 2003-2011 by Alexander Barton (alex@barton.de)
 #
 
 [ -e ~/.ConfigScripts.debug ] && echo " >> /etc/profile ..."
@@ -20,17 +20,16 @@ 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=""
-for d in /usr/pkg/bin /opt/*/bin; do
+for d in /Developer/usr/bin /usr/pkg/bin /usr/lib/ccache /opt/*/bin; do
 	[ -d "$d" -o -h "$d" ] && path="$path$d:"
 done
 [ -n "$path" ] && PATH="$path$PATH"
@@ -50,16 +49,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 2>/dev/null)" ]; 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)
@@ -74,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
@@ -102,6 +103,15 @@ fi
 # read local profile, if available
 [ -r "/var/lib/${ME}/profile" ] && . /var/lib/${ME}/profile
 
+# Setup some directories to use local storage (no NFS)
+[ -d "/usr/local/home/$USER" ] \
+	|| mkdir -p "/usr/local/home/$USER" >/dev/null 2>&1
+if [ -w "/usr/local/home/$USER" ]; then
+	export LOCAL_HOME="/usr/local/home/$USER"
+	export CCACHE_DIR="$LOCAL_HOME/.ccache"
+	export XDG_CACHE_HOME="$LOCAL_HOME/.cache"
+fi
+
 # interactive shell?
 [ "$PS1" ] || return
 
@@ -110,6 +120,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
@@ -121,7 +150,10 @@ fi
 	&& . /etc/ksh.kshrc
 
 # Check filesystem quotas
-which quota >/dev/null 2>&1
-[ $? -eq 0 ] && quota -q
+mount 2>/dev/null | grep quota >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+	which quota >/dev/null 2>&1
+	[ $? -eq 0 ] && quota -q
+fi
 
 # -eof-