X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sys%2Fprofile;h=8fac5d53d88108ed78e55533e784b9db6d10d71f;hb=06cec96159898800ffb095ff6c23ebc60f401887;hp=4295e48d1045cd3235e4465d4acbe8992b57f185;hpb=feb05039b58cc5e78110f539ea11de12e4322ad6;p=ConfigScripts.git

diff --git a/sys/profile b/sys/profile
index 4295e48..8fac5d5 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
@@ -103,6 +114,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
 
@@ -125,7 +145,8 @@ 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