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

diff --git a/sys/profile b/sys/profile
index b94d875..3af1ad9 100644
--- a/sys/profile
+++ b/sys/profile
@@ -1,17 +1,15 @@
 #
 # /etc/profile: system-wide profile for the Bourne shell (sh(1)) and
 # Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
-# Written 2003-2014 by Alexander Barton (alex@barton.de)
+# Written 2003-2015 by Alexander Barton (alex@barton.de)
 #
 
-[ -e ~/.ConfigScripts.debug ] && 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
+[ -e ~/.ConfigScripts.debug ] && echo " >> /etc/profile ..."
 
 # Setup locale and encoding
 if [ -e ~/.ConfigScripts.debug ]; then
@@ -22,9 +20,9 @@ fi
 # Does LC_CTYPE or LANG indicate an UTF-8 terminal?
 LC_encoding=""
 if [ -n "$LC_CTYPE" ]; then
-	LC_encoding="${LC_CTYPE#*.}"
+	LC_encoding=`echo "$LC_CTYPE" | cut -d. -f2- -s`
 elif [ -n "$LANG" ]; then
-	LC_encoding="${LANG#*.}"
+	LC_encoding=`echo "$LANG" | cut -d. -f2- -s`
 fi
 if [ -z "$LC_encoding" ]; then
 	case "$TERM" in
@@ -39,10 +37,6 @@ fi
 [ "$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 "$DESKTOP_SESSION" -a -z "$SESSION_MANAGER" ] \
-	&& export LC_MESSAGES="C"
 # Clean up ...
 unset LC_CTYPE LC_encoding 2>/dev/null
 
@@ -55,25 +49,26 @@ if [ -x /usr/libexec/path_helper ]; then
 		|| PATH="/usr/local/bin:$PATH"
 else
 	PATH="/usr/local/bin:/usr/bin:/bin"
-	[ "$UID" -eq 0 ] && PATH="/usr/local/sbin:/usr/sbin:/sbin:$PATH"
+	[ "$LOGNAME" = "root" ] && PATH="/usr/local/sbin:/usr/sbin:/sbin:$PATH"
 	export PATH
 fi
 # prepend optional directories to PATH ...
-path=""
+unset path
 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=""
+unset path
+if [ "$LOGNAME" = "root" ]; then
 	for d in /usr/pkg/sbin /opt/*/sbin; do
 		if [ -d "$d" -o -h "$d" ]; then
 			[ -e "$d/.not_in_path" ] || path="$path$d:"
 		fi
 	done
 	[ -n "$path" ] && PATH="$path$PATH"
+	unset path
 fi
 # append optional directories to PATH ...
 for d in /usr/bin/X11 /usr/games /usr/share/php/bin; do
@@ -81,6 +76,7 @@ for d in /usr/bin/X11 /usr/games /usr/share/php/bin; do
 		[ -e "$d/.not_in_path" ] || PATH="$PATH:$d"
 	fi
 done
+unset d
 # set PATH so it includes user's private executables
 [ -d ~/Applications -a ! -e ~/Applications/.not_in_path ] \
 	&& PATH=~/Applications:"${PATH}"
@@ -90,7 +86,7 @@ done
 	&& PATH=~/sbin:"${PATH}"
 
 # Setup MANPATH, if manpath(1) isn't available
-if [ ! "$(type manpath 2>/dev/null)" ]; then
+if [ ! "$(type -t manpath 2>/dev/null)" ]; then
 	[ -z "$MANPATH" ] \
 		&& MANPATH="/usr/local/share/man:/usr/share/man:/usr/man"
 	path=""
@@ -100,26 +96,44 @@ if [ ! "$(type manpath 2>/dev/null)" ]; then
 	[ -n "$path" ] && MANPATH="$path$MANPATH"
 	[ -d ~/share/man ] && MANPATH=~/share/man:"${MANPATH}"
 	[ -d ~/man ] && MANPATH=~/man:"${MANPATH}"
+	unset path d
 fi
 
 # 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)
 
-# 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 2>/dev/null`
-export ME
+[ -n "$HOSTNAME" ] || HOSTNAME=`hostname 2>/dev/null`
+export HOSTNAME
+
+# Setup local home directory, when available
+[ -d "/usr/local/home" -a ! -d "/usr/local/home/$LOGNAME" ] \
+	&& mkdir "/usr/local/home/$LOGNAME" >/dev/null 2>&1
+[ -w "/usr/local/home/$LOGNAME" ] \
+	&& export LOCAL_HOME="/usr/local/home/$LOGNAME" \
+	|| export LOCAL_HOME="$HOME"
+
+# Source "~/.profile.user-1st", when available
+[ -r ~/.profile.user-1st ] && . ~/.profile.user-1st
+
+# Setup environment to use local storage (no NFS, if possible!)
+export XDG_CACHE_HOME="$LOCAL_HOME/.cache"
+
+# Setup environment for ccache, if installed
+type -t ccache >/dev/null && export CCACHE_DIR="$XDG_CACHE_HOME/ccache"
+
+# Setup environment for Python "pip", if installed
+if [ "$(type -t pip 2>/dev/null)" ]; then
+	export PIP_REQUIRE_VIRTUALENV=true
+	export PIP_DOWNLOAD_CACHE="$XDG_CACHE_HOME/pip"
+fi
 
 # 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"
+	cp ~/.Xauthority /tmp/Xauthority-$LOGNAME
+	chmod 600 /tmp/Xauthority-$LOGNAME
+	export XAUTHORITY="/tmp/Xauthority-$LOGNAME"
 fi
 
 # read profile additions
@@ -135,50 +149,52 @@ if [ -d /etc/profile.d -o -d /usr/local/etc/profile.d ]; then
 				. "$f"
 		esac
 	done
+	unset f
 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
+[ -r "/var/lib/${HOSTNAME}/profile" ] && . /var/lib/${HOSTNAME}/profile
 
 # interactive shell?
-[ "$PS1" ] || return
+case "$-" in
+	*i*) ;;
+	*) return ;;
+esac
 
 # validate terminal definition
-type -p tset >/dev/null 2>&1
-[ $? -eq 0 ] && eval `tset -s -Q`
+type -t tset >/dev/null && 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 '^$'
+[ "$LOGNAME" = "root" ] \
+	&& PS1="<$HOSTNAME> # " \
+	|| PS1="<$HOSTNAME> \$ "
+
+# Reminders (once every 60 minutes)
+if [ -z `find ~/.last_reminder -mmin -60 2>/dev/null` ]; then
+	[ -e ~/.ConfigScripts.debug ] && echo " - Reminders ..."
+	if [ "$(type -t icalBuddy >/dev/null)" -a "$LOGNAME" != "root" ]; then
+		# icalBuddy(1)
+		case "$LANG" in
+			*.UTF*)	bul="•"; bul_imp="!"; sep="»"; ;;
+			*)	bul="*"; bul_imp="!"; sep=">"; ;;
+		esac
+		icalBuddy -f -n -b " $bul " -ab " $bul_imp " -ps "/ $sep /" \
+			-nc -npn -iep "title,due" -stda \
+			tasksDueBefore:today 2>/dev/null
+		icalBuddy -f -n -b " $bul " -ab " $bul_imp " -ps "/ $sep /" \
+			-nc -npn -iep "title,datetime" \
+			eventsToday+1 2>/dev/null
 		[ $? -eq 0 ] && echo
+		unset bul bul_imp sep
+	else
+		# remind(1)
+		if [ "$(type -t remind >/dev/null)" -a -r ~/.remind ]; then
+			remind -h -g -t5 ~/.remind | \
+				grep -v '^Reminders for ' | grep -v '^$'
+			[ $? -eq 0 ] && echo
+		fi
 	fi
+	[ -w ~/ ] && touch ~/.last_reminder
 fi
 
 # bash-specific initialization
@@ -194,8 +210,7 @@ fi
 # 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
+	type -t quota >/dev/null && quota -q
 fi
 
 # -eof-