Reminders: only create "~/.last_reminder" when "~" is writable

[ConfigScripts.git] / sys / profile

diff --git a/sys/profile b/sys/profile
index 6cba9f478dfbe47a0847cf84cb147bb7c83ff800..0e69c899f74138f13e080bbd8b44eba7ac4ac64f 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\""
@@ -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
@@ -84,7 +86,7 @@ unset d
        && 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=""
@@ -105,6 +107,25 @@ 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"
+
+# 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
@@ -131,20 +152,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
 
 # 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" ] \
@@ -154,8 +166,7 @@ type tset >/dev/null 2>&1 && eval `tset -s -Q`
 # Reminders (once every 60 minutes)
 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="»"; ;;
@@ -171,14 +182,13 @@ if [ -z `find ~/.last_reminder -mmin -60 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
@@ -194,7 +204,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-