X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sys%2Fprofile;h=a68b497a55c46bc823f33149cc14b1f0856408a0;hb=d7a7a2e76a1a370be33fb6a0281d45d7b7791f66;hp=2e4f778542a814156d22469bb080eb3eeba9860f;hpb=41b5f448d5b1327dbc307d5d71187c63aaa13d7f;p=ConfigScripts.git

diff --git a/sys/profile b/sys/profile
index 2e4f778..a68b497 100644
--- a/sys/profile
+++ b/sys/profile
@@ -1,14 +1,16 @@
 #
 # /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
 
+[ -e ~/.ConfigScripts.debug ] && echo " >> /etc/profile ..."
+
 # Setup locale and encoding
 if [ -e ~/.ConfigScripts.debug ]; then
 	echo " - TERM=\"$TERM\""
@@ -18,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
@@ -51,28 +53,43 @@ else
 	export PATH
 fi
 # prepend optional directories to PATH ...
-path=""
-for d in /Developer/usr/bin /usr/pkg/bin /usr/ucb /usr/lib/ccache /opt/*/bin; do
+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"
+unset path
 if [ "$LOGNAME" = "root" ]; then
-	path=""
-	for d in /usr/pkg/sbin /opt/*/sbin; do
+	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
+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
+unset d
 # set PATH so it includes user's private executables
 [ -d ~/Applications -a ! -e ~/Applications/.not_in_path ] \
 	&& PATH=~/Applications:"${PATH}"
@@ -82,16 +99,22 @@ 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=""
-	for d in /usr/pkg/share/man /usr/pkg/man /opt/*/share/man /opt/*/man; do
+	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}"
+	unset path d
 fi
 
 # set variable identifying the chroot you work in
@@ -102,6 +125,28 @@ fi
 [ -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-$LOGNAME
@@ -111,7 +156,10 @@ fi
 
 # read profile additions
 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
+	for f in \
+	  /etc/profile.d/* \
+	  /usr/local/etc/profile.d/*
+	do
 		[ -r "$f" ] || continue
 		case "$f" in
 			*.csh)
@@ -122,25 +170,20 @@ 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/${HOSTNAME}/profile" ] && . /var/lib/${HOSTNAME}/profile
 
-# Setup some directories to use local storage (no NFS)
-[ -d "/usr/local/home/$LOGNAME" ] \
-	|| ( mkdir /usr/local/home; mkdir "/usr/local/home/$LOGNAME" ) >/dev/null 2>&1
-if [ -w "/usr/local/home/$LOGNAME" ]; then
-	export LOCAL_HOME="/usr/local/home/$LOGNAME"
-	export CCACHE_DIR="$LOCAL_HOME/.ccache"
-	export XDG_CACHE_HOME="$LOCAL_HOME/.cache"
-fi
-
 # interactive shell?
-[ "$PS1" ] || return
+case "$-" in
+	*i*) ;;
+	*) return ;;
+esac
 
 # validate terminal definition
-type tset >/dev/null 2>&1 && eval `tset -s -Q`
+type -t tset >/dev/null && eval `tset -s -Q`
 
 # generic shell prompt
 [ "$LOGNAME" = "root" ] \
@@ -148,10 +191,9 @@ type tset >/dev/null 2>&1 && eval `tset -s -Q`
 	|| PS1="<$HOSTNAME> \$ "
 
 # Reminders (once every 60 minutes)
-if [ -z `find ~/.last_reminder -mmin 1 2>/dev/null` ]; then
+if [ -z `find ~/.last_reminder -mmin -60 2>/dev/null` ]; then
 	[ -e ~/.ConfigScripts.debug ] && echo " - Reminders ..."
-	type icalBuddy >/dev/null 2>&1
-	if [ $? -eq 0 -a "$LOGNAME" != "root" ]; then
+	if [ "$(type -t icalBuddy >/dev/null)" -a "$LOGNAME" != "root" ]; then
 		# icalBuddy(1)
 		case "$LANG" in
 			*.UTF*)	bul="•"; bul_imp="!"; sep="»"; ;;
@@ -167,14 +209,13 @@ if [ -z `find ~/.last_reminder -mmin 1 2>/dev/null` ]; then
 		unset bul bul_imp sep
 	else
 		# remind(1)
-		type remind >/dev/null 2>&1
-		if [ $? -eq 0 -a -r ~/.remind ]; then
+		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
-	touch ~/.last_reminder
+	[ -w ~/ ] && touch ~/.last_reminder
 fi
 
 # bash-specific initialization
@@ -190,7 +231,7 @@ fi
 # Check filesystem quotas
 mount 2>/dev/null | grep quota >/dev/null 2>&1
 if [ $? -eq 0 ]; then
-	type quota >/dev/null 2>&1 && quota -q
+	type -t quota >/dev/null && quota -q
 fi
 
 # -eof-