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

diff --git a/sys/profile b/sys/profile
index 15cee68..3af1ad9 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\""
@@ -105,10 +107,26 @@ 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="$HOME/.cache/pip"
+	export PIP_DOWNLOAD_CACHE="$XDG_CACHE_HOME/pip"
 fi
 
 # Move Xauthority file to local storage, so that sudo et all work
@@ -137,17 +155,11 @@ 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 -t tset >/dev/null && eval `tset -s -Q`
@@ -182,7 +194,7 @@ if [ -z `find ~/.last_reminder -mmin -60 2>/dev/null` ]; then
 			[ $? -eq 0 ] && echo
 		fi
 	fi
-	touch ~/.last_reminder
+	[ -w ~/ ] && touch ~/.last_reminder
 fi
 
 # bash-specific initialization