Make check for "interactive shells" more robust

[ConfigScripts.git] / sys / profile

diff --git a/sys/profile b/sys/profile
index ca27bbbcfa0929b098f79ffe53b0b48bd1321786..207bf5baf2134451e606fec6158fa0e02b60b2a8 100644 (file)
--- a/sys/profile
+++ b/sys/profile
@@ -4,11 +4,13 @@
 # Written 2003-2014 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,21 +107,23 @@ 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"
+
+# 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 2>/dev/null && export CCACHE_DIR="$XDG_CACHE_HOME/ccache"
+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
@@ -149,7 +153,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 +191,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