Merge remote-tracking branch 'uni/master'

diff --git a/shell/env b/shell/env
index 0739edf061ca91822e9cd206ce409c35eb00bf5f..b7b1e13a28d7e17b56c02e1693d01d26cacc61b3 100644 (file)
--- a/shell/env
+++ b/shell/env
@@ -28,9 +28,15 @@ export EDITOR
 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