X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=sys%2Fprofile;h=67b6314e59994002ab8c197d18b1bee835c9196c;hb=659ed6dc3316ccd136f966d84bb7a7def6901bc2;hp=c4a05d5f1b6dc034dd8c8ee55fc437a6a5eb8c3c;hpb=c5f8e8d2a9f9ddf00240611ad3c98b9a02ff5c6d;p=ConfigScripts.git

diff --git a/sys/profile b/sys/profile
index c4a05d5..67b6314 100644
--- a/sys/profile
+++ b/sys/profile
@@ -1,134 +1,174 @@
 #
 # /etc/profile: system-wide profile for the Bourne shell (sh(1)) and
 # Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
-#
-# 2008-08-07, alex@barton.de
-#  - Added support for /etc/profile.d
-#  - Added support for /etc/chroot_name
-#  - Restructure PATH and MANPATH detecttion.
-#  - Add ~/Applications to PATH.
-#  - Add generic chroot name check.
-#  - Check if debian_chroot is readable (insted of if it exists).
-#  - Fix quota check, don't use full path name
-# 2007-10-28, alex@barton.de
-#  - Look for /usr/libexec/path_helper, used by Mac OS X 10.5
-# 2007-04-05, alex@barton.de
-#  - Check for and read /etc/bashrc as well, if /etc/bash.bashrc doesn't exist
-# 2006-01-04, alex@barton.de
-#  - Use "hostname -s" (not "--short") for compatibility to [Net]BSD.
-#  - Added /usr/pkg/bin to optional PATH components.
-# 2005-04-23, alex@Arthur.Ath.CX
-#  - Removed umask, we do use the system default now.
-# 2005-02-19, alex@Arthur.Ath.CX
-#  - Removed export of CVS_RSH and MANWIDTH: use /etc/environment!
-# 2005-02-04, alex@Arthur.Ath.CX
-#  - Added export of CVS_RSH.
-#  - Added export of MANWIDTH=80.
-# 2005-01-23, alex@Arthur.Ath.CX
-#  - Added check for quotas
-# 2004-09-13, alex@Arthur.Ath.CX
-#  - I made this script more generic, so that it is usabe for other systems
-#    than Arthur as well: read in local profile from /var/lib/$ME/profile
-#    after the initialization done in here.
-#  - Changed shell prompt to generic version using "<" and ">".
-#  - Make sure that $ME is set, even when not running interactive.
-# 2004-08-11, alex@Arthur.Ath.CX
-#  - Make sure that $USER is set.
-#  - Always export $UID and $USER variables.
-# 2004-07-30, alex@Arthur.Ath.CX
-#  - Make sure $UID is set.
-#  - Let ksh read in "/etc/ksh.kshrc".
-# 2004-05-20, alex@Arthur.Ath.CX
-#  - Added support for "$debian_chroot"
-# 2004-02-16, alex@Arthur.Ath.CX
-#  - Removed test for old home directory.
-# 2004-02-02, alex@Arthur.Ath.CX
-#  - Added scan for optional PATH elements.
-# 2003-12-18, alex@Arthur.Ath.CX
-#  - Initial version.
+# Written 2003-2012 by Alexander Barton (alex@barton.de)
 #
 
-[ -e /tmp/ConfigDebug.$USER ] && echo " >> /etc/profile ..."
+[ -e ~/.ConfigScripts.debug ] && echo " >> /etc/profile ..."
 
 PROFILEREAD="true"
 export PROFILEREAD
 
+# Make sure UID is set
+[ -n "$UID" ] || UID=`id -u`
+export UID
+
+# Indicates LC_CTYPE an UTF-8 terminal?
+if [ -n "$LC_CTYPE" ]; then
+	LC_encoding="${LC_CTYPE#*.}"
+else
+	case "$TERM" in
+		"xterm-"*)
+			LC_encoding="UTF-8"; ;;
+		*)
+			LC_encoding="ISO8859-1"
+	esac
+fi
+# 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}"
+# 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`
+	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"
+	export PATH
 fi
 # prepend optional directories to PATH ...
 path=""
-for d in /usr/pkg/bin /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; do
-	[ -d "$d" -o -h "$d" ] && PATH="$PATH:$d"
+for d in /usr/bin/X11 /usr/games /usr/share/php/bin; do
+	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}"
-
-# set MANPATH so it includes user's private man files
-if [ -n "$MANPATH" ]; then
+[ -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
+	[ -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)
 [ -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
+if [ -z "$XAUTHORITY" -a -r ~/.Xauthority ]; then
+	cp ~/.Xauthority /tmp/Xauthority-$USER
+	chmod 600 /tmp/Xauthority-$USER
+	export XAUTHORITY="/tmp/Xauthority-$USER"
+fi
+
 # read profile additions
-if [ -d /etc/profile.d ]; then
-	for f in /etc/profile.d/*; do
- 		[ -r "$f" ] && . "$f"
+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)
+				;;
+			*)
+				[ -e ~/.ConfigScripts.debug ] \
+					&& echo " >> $f ..."
+				. "$f"
+		esac
 	done
 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 /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"
+	export XDG_CACHE_HOME="$LOCAL_HOME/.cache"
+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> # " \
 	|| 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 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 -v '^Reminders for ' | grep -v '^$'
+		[ $? -eq 0 ] && echo
+	fi
+fi
+
 # bash-specific initialization
 [ "$BASH" -a -z "$BASHRCREAD" -a -r /etc/bash.bashrc ] \
 	&& source /etc/bash.bashrc
@@ -139,8 +179,11 @@ fi
 [ "$KSH_VERSION" -a -z "$KSHRCREAD" -a -r /etc/ksh.kshrc ] \
 	&& . /etc/ksh.kshrc
 
-# Check quotas
-which quota >/dev/null 2>&1
-[ $? -eq 0 ] && quota -q
+# Check filesystem quotas
+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-