Read ~/.profile.user-1st after initializing basic environment

[ConfigScripts.git] / sys / profile

diff --git a/sys/profile b/sys/profile
index 368d07e62d98093aa631780960500dc90cc124e9..3af1ad9b45bec00c276104f677ed411d1c85131f 100644 (file)
--- 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,12 +107,17 @@ fi
 [ -n "$HOSTNAME" ] || HOSTNAME=`hostname 2>/dev/null`
 export HOSTNAME
 
-# 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
+# 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
@@ -149,7 +156,10 @@ fi
 [ -r "/var/lib/${HOSTNAME}/profile" ] && . /var/lib/${HOSTNAME}/profile
 
 # interactive shell?
-[ "$PS1" ] || return
+case "$-" in
+       *i*) ;;
+       *) return ;;
+esac
 
 # validate terminal definition
 type -t tset >/dev/null && eval `tset -s -Q`
@@ -184,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