X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sys%2Fprofile;h=423c3803e1177587dd2512dc8aaee5dc5b5dcdb0;hb=aa7dcef69b644da6604835d1be5b27bd4856f2d8;hp=546f0acea549f288427aa458aa8e02d13e034092;hpb=a9c9b76faef09392767684a88fca8394227a9c70;p=ConfigScripts.git

diff --git a/sys/profile b/sys/profile
index 546f0ac..423c380 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-2012 by Alexander Barton (alex@barton.de)
 #
 
 [ -e ~/.ConfigScripts.debug ] && echo " >> /etc/profile ..."
@@ -13,24 +13,30 @@ export PROFILEREAD
 [ -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.
+# Indicates LC_CTYPE an UTF-8 terminal?
+[ -n "$LC_CTYPE" ] \
+	&& LC_encoding="${LC_CTYPE#*.}" || LC_encoding="ISO8859-1"
+# Set locale if it is not set or doesn't contain a dot:
 [ "$LANG" = "${LANG#*.}" -a "$LANG" != "C" ] \
-	&& export LANG="${LANG:-de_DE}.ISO8859-1"
-export LC_MESSAGES="C"
+	&& export LANG="${LANG:-de_DE}.${LC_encoding}"
+# 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
 
 # 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 /Developer/usr/bin /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"
@@ -51,7 +57,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 +82,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
@@ -104,6 +110,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
 
@@ -112,11 +127,24 @@ fi
 	&& PS1="<$ME> # " \
 	|| PS1="<$ME> \$ "
 
-# remind(1)
-type -p remind >/dev/null 2>&1
-if [ $? -eq 0 -a -r ~/.remind ]; then
-	remind -h -g -t5 .remind | grep "^[0-9]"
+# 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 -v '^Reminders for ' | grep -v '^$'
+		[ $? -eq 0 ] && echo
+	fi
 fi
 
 # bash-specific initialization
@@ -130,7 +158,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-