X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sys%2Fprofile;h=f9275b4a71fde3cf49f4615e9923533094c7e0a4;hb=21c214fab64d81c831ab63a3ae163a769f36dd91;hp=97a7e67da6baad3e0c540144481df9af37c6db8f;hpb=2e2926ffc9b0dc708a9e30ffab2d726c2b604d2c;p=ConfigScripts.git

diff --git a/sys/profile b/sys/profile
index 97a7e67..f9275b4 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,15 +13,26 @@ 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
 if [ -x /usr/libexec/path_helper ]; then
-	eval `/usr/libexec/path_helper -s`
+	eval `/usr/libexec/path_helper -s \
+		| sed "s|:/usr/local/bin||" | sed "s|:/usr/local/sbin||"`
+	[[ "$PATH" == *sbin* ]] \
+		&& PATH="/usr/local/bin:/usr/local/sbin:$PATH" \
+		|| PATH="/usr/local/bin:$PATH"
 else
 	PATH="/usr/local/bin:/usr/bin:/bin"
 	[ "$UID" -eq 0 ] && PATH="/usr/local/sbin:/usr/sbin:/sbin:$PATH"
@@ -29,7 +40,7 @@ else
 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"
@@ -41,7 +52,7 @@ if [ "$UID" -eq 0 ]; then
 	[ -n "$path" ] && PATH="$path$PATH"
 fi
 # append optional directories to PATH ...
-for d in /usr/bin/X11 /usr/games; do
+for d in /usr/bin/X11 /usr/games /usr/share/php/bin; do
 	[ -d "$d" -o -h "$d" ] && PATH="$PATH:$d"
 done
 # set PATH so it includes user's private executables
@@ -50,7 +61,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=""
@@ -66,16 +77,13 @@ fi
 [ -r /etc/debian_chroot ] && chroot_name=$(cat /etc/debian_chroot)
 [ -r /etc/chroot_name ] && chroot_name=$(cat /etc/chroot_name)
 
-# validate terminal definition
-[ -z "$TERM" ] && eval `tset -s -Q`
-
 # 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 -s`
+ME=`hostname 2>/dev/null`
 export ME
 
 # Move Xauthority file to local storage, so that sudo et all work
@@ -86,8 +94,8 @@ if [ -z "$XAUTHORITY" -a -r ~/.Xauthority ]; then
 fi
 
 # read profile additions
-if [ -d /etc/profile.d ]; then
-	for f in /etc/profile.d/*; do
+if [ -d /etc/profile.d -o -d /usr/local/etc/profile.d ]; then
+	for f in /etc/profile.d/* /usr/local/etc/profile.d/*; do
 		[ -r "$f" ] || continue
 		case "$f" in
 			*.csh)
@@ -103,9 +111,21 @@ 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
 
+# validate terminal definition
+eval `tset -s -Q`
+
 # generic shell prompt
 [ "$UID" -eq 0 ] \
 	&& PS1="<$ME> # " \
@@ -113,15 +133,20 @@ fi
 
 # icalBuddy(1)
 type -p icalBuddy >/dev/null 2>&1
-if [ $? -eq 0 ]; then
-	icalBuddy -f -n -npn -nc -ps "/ » /" -eep "url,notes" \
-		eventsToday+1 | grep "•"
+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 2>/dev/null | 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]"
+		remind -h -g -t5 ~/.remind | \
+			grep -v '^Reminders for ' | grep -v '^$'
 		[ $? -eq 0 ] && echo
 	fi
 fi
@@ -137,7 +162,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-