Merge remote-tracking branch 'uni/master'

diff --combined shell/env
index 0739edf061ca91822e9cd206ce409c35eb00bf5f,c1a950e70a465c188558f552f81306851a15fdda..b7b1e13a28d7e17b56c02e1693d01d26cacc61b3
--- 1/shell/env
--- 2/shell/env
+++ b/shell/env
@@@ -28,19 -28,21 +28,25 @@@ export EDITO
  PAGER=less
  export PAGER
  
- # Use ~/tmp as directory for temporary files if available to reduce security
+ # Use ~/.tmp as directory for temporary files if available to reduce security
  # problems on multi-user systems.
- if [ -O ~/tmp -a -d ~/tmp ]; then
+ if [ -O ~/.tmp -a -d ~/.tmp ]; then
+     TMP=~/.tmp
+     TEMP=$TMP
+     TMPDIR=$TMP
+     export TMP TEMP TMPDIR
+ # Also try ~/tmp as fallback.
+ elif [ -O ~/tmp -a -d ~/tmp ]; then
      TMP=~/tmp
      TEMP=$TMP
      TMPDIR=$TMP
      export TMP TEMP TMPDIR
  fi
  
 +# Change rlwrap's home directory to prevent cluttering ~.
 +RLWRAP_HOME=~/.shell/rlwrap
 +export RLWRAP_HOME
 +
  # Set colors for GNU ls (and zsh completions).
  # See `dircolors --print-database` for possible colors.
  LS_COLORS='no=00'