X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=sys%2Fprofile;h=b94d875e9d7ab7323357af9a34eba685d236d6cb;hb=0daadf425f29c652a25f7d39a93cf83b348b8aad;hp=7a356c101232bcfce467e06ae1a434092443cc69;hpb=e8a2ac3e5e03e537bef7d95288e003f38109e169;p=ConfigScripts.git

diff --git a/sys/profile b/sys/profile
index 7a356c1..b94d875 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-2012 by Alexander Barton (alex@barton.de)
+# Written 2003-2014 by Alexander Barton (alex@barton.de)
 #
 
 [ -e ~/.ConfigScripts.debug ] && echo " >> /etc/profile ..."
@@ -13,22 +13,46 @@ export PROFILEREAD
 [ -n "$UID" ] || UID=`id -u`
 export UID
 
-# Indicates LC_CTYPE an UTF-8 terminal?
-[ -n "$LC_CTYPE" ] \
-	&& LC_encoding="${LC_CTYPE#*.}" || LC_encoding="ISO8859-1"
+# Setup locale and encoding
+if [ -e ~/.ConfigScripts.debug ]; then
+	echo " - TERM=\"$TERM\""
+	echo " - LANG=\"$LANG\""
+	echo " - LC_CTYPE=\"$LC_CTYPE\""
+fi
+# Does LC_CTYPE or LANG indicate an UTF-8 terminal?
+LC_encoding=""
+if [ -n "$LC_CTYPE" ]; then
+	LC_encoding="${LC_CTYPE#*.}"
+elif [ -n "$LANG" ]; then
+	LC_encoding="${LANG#*.}"
+fi
+if [ -z "$LC_encoding" ]; then
+	case "$TERM" in
+		"xterm-"*)
+			LC_encoding="UTF-8"; ;;
+		*)
+			LC_encoding="ISO8859-1"
+	esac
+fi
+[ -e ~/.ConfigScripts.debug ] && echo " - LC_encoding=\"$LC_encoding\" (temp)"
 # Set locale if it is not set or doesn't contain a dot:
 [ "$LANG" = "${LANG#*.}" -a "$LANG" != "C" ] \
 	&& export LANG="${LANG:-de_DE}.${LC_encoding}"
+[ -e ~/.ConfigScripts.debug ] && echo " - LANG=\"$LANG\" (new)"
 # All system messages should still be in "native" ("C") language for
 # non-X11 sessions:
-[ -z "$GDMSESSION" -a -z "$XDG_SESSION_COOKIE" ] \
+[ -z "$GDMSESSION" -a -z "$DESKTOP_SESSION" -a -z "$SESSION_MANAGER" ] \
 	&& 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"
@@ -36,25 +60,34 @@ else
 fi
 # prepend optional directories to PATH ...
 path=""
-for d in /Developer/usr/bin /usr/pkg/bin /usr/lib/ccache /opt/*/bin; do
-	[ -d "$d" -o -h "$d" ] && path="$path$d:"
+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"
 if [ "$UID" -eq 0 ]; then
 	path=""
 	for d in /usr/pkg/sbin /opt/*/sbin; do
-		[ -d "$d" -o -h "$d" ] && path="$path$d:"
+		if [ -d "$d" -o -h "$d" ]; then
+			[ -e "$d/.not_in_path" ] || path="$path$d:"
+		fi
 	done
 	[ -n "$path" ] && PATH="$path$PATH"
 fi
 # append optional directories to PATH ...
 for d in /usr/bin/X11 /usr/games /usr/share/php/bin; do
-	[ -d "$d" -o -h "$d" ] && PATH="$PATH:$d"
+	if [ -d "$d" -o -h "$d" ]; then
+		[ -e "$d/.not_in_path" ] || PATH="$PATH:$d"
+	fi
 done
 # set PATH so it includes user's private executables
-[ -d ~/Applications ] && PATH=~/Applications:"${PATH}"
-[ -d ~/bin ] && PATH=~/bin:"${PATH}"
-[ -d ~/sbin ] && PATH=~/sbin:"${PATH}"
+[ -d ~/Applications -a ! -e ~/Applications/.not_in_path ] \
+	&& PATH=~/Applications:"${PATH}"
+[ -d ~/bin -a ! -e ~/bin/.not_in_path ] \
+	&& PATH=~/bin:"${PATH}"
+[ -d ~/sbin -a ! -e ~/sbin/.not_in_path ] \
+	&& PATH=~/sbin:"${PATH}"
 
 # Setup MANPATH, if manpath(1) isn't available
 if [ ! "$(type manpath 2>/dev/null)" ]; then
@@ -73,9 +106,6 @@ 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`
@@ -93,8 +123,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)
@@ -112,7 +142,7 @@ fi
 
 # Setup some directories to use local storage (no NFS)
 [ -d "/usr/local/home/$USER" ] \
-	|| mkdir -p "/usr/local/home/$USER" >/dev/null 2>&1
+	|| ( mkdir /usr/local/home; mkdir "/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"
@@ -122,6 +152,10 @@ fi
 # interactive shell?
 [ "$PS1" ] || return
 
+# validate terminal definition
+type -p tset >/dev/null 2>&1
+[ $? -eq 0 ] && eval `tset -s -Q`
+
 # generic shell prompt
 [ "$UID" -eq 0 ] \
 	&& PS1="<$ME> # " \
@@ -135,7 +169,7 @@ if [ $? -eq 0 -a "$UID" -ne 0 ]; then
 		*)	BUL="*"; SEP=">"; ;;
 	esac
 	icalBuddy -f -n -npn -nc -b " $BUL " -ps "/ $SEP /" -eep "url,notes" \
-		eventsToday+1 | grep "$BUL"
+		eventsToday+1 2>/dev/null | grep "$BUL"
 	[ $? -eq 0 ] && echo
 else
 	# remind(1)