zshenv: update tmp

diff --git a/etc/zsh/.zshenv b/etc/zsh/.zshenv
index 1248dbf6f9d23ddc9f4007eb3862748f2d68b3e2..f1e6a55bbb1f95948459bf25c1063fefdba9fbb4 100644 (file)
--- a/etc/zsh/.zshenv
+++ b/etc/zsh/.zshenv
@@ -154,10 +154,10 @@ if [[ ! -v _sev_setup_path || -o login ]] {
 #       the toplevel shell has already logged out and the dirs removed, but the
 #       chances of that are slim.
 if [[ ! -v _sev_tmp ]] {
+    _sev_tmp=~/.local/tmp
     # create personal TMPDIR under system tmp
     t=${TMPDIR:-${TEMPDIR:-${TEMP:-${TMP:-${${TMPPREFIX%/zsh}:-/tmp}}}}}/.home-$LOGNAME
     [[ -e $t ]] || mkdir -m700 $t 2>/dev/null
-    _sev_tmp=~/.local/tmp
     if [[ ! -d $t ]] {
         # fallback TMPDIR to bare local directory or existing softlink
         [[ -o interactive ]] &&
@@ -169,33 +169,34 @@ if [[ ! -v _sev_tmp ]] {
             [[ -o interactive ]] &&
               print -P "%F{red}!!! Can't create tmp dir, using $_sev_tmp%f"
         }
-    } elif [[ -f $_sev_tmp || ( -d $_sev_tmp && ! -h $_sev_tmp ) ]] {
-        # file or non-softlink directory is on our local dir
+    } elif [[ -e $_sev_tmp && ! -h $_sev_tmp ]] {
+        # non-softlink node is on our local dir
         [[ -o interactive ]] &&
           print -P "%F{orange}*** $_sev_tmp exists, can't link to tmp dir $t, ignoring it%f"
         _sev_tmp=$t
     } else {
-        # link local dir to tmp dir
-        if [[ -h $_sev_tmp && $_sev_tmp:P != $t:P ]] {
-            [[ -o interactive ]] &&
+        if [[ -h $_sev_tmp ]] {
+            [[ -o interactive && $_sev_tmp:P != $t:P ]] &&
               print -P "%F{orange}*** $_sev_tmp links to ${_sev_tmp:P} and not ${t:P}, unlinking it%f"
-            # XXX: race condition for existing sessions still using this dir
+            # NOTE: ln -f doesn't seem to work reliably with softlink
+            #       directories, so explicitly remove the target if it exists
+            # XXX: potential race condition
+            # TODO: handle cleanup of old dir if it doesn't match?
             unlink $_sev_tmp 2>/dev/null
         }
+        # link local dir to tmp dir
         ln -s $t $_sev_tmp 2>/dev/null
     }
-    if [[ -v _sev_tmp ]] {
-        # ensure dir is clean
-        _sev_zcleanup tmp
-        # finally create our subdir for this session
-        t=$_sev_tmp/.session.$$
-        if ! mkdir -m700 $t 2>/dev/null; then
-            [[ -o interactive ]] &&
-              print -P "%F{red}!!! Can't create session tmp subdir $t, using $_sev_tmp%f"
-            t=$_sev_tmp
-        fi
-        export _sev_tmp TMPDIR=$t TEMPDIR=$t TEMP=$t TMP=$t TMPPREFIX=$t/zsh
-    }
+    # ensure dir is clean
+    _sev_zcleanup tmp
+    # finally create our subdir for this session
+    t=$_sev_tmp/.session.$$
+    if ! mkdir -m700 $t 2>/dev/null; then
+        [[ -o interactive ]] &&
+          print -P "%F{red}!!! Can't create session tmp subdir $t, using $_sev_tmp%f"
+        t=$_sev_tmp
+    fi
+    export _sev_tmp TMPDIR=$t TEMPDIR=$t TEMP=$t TMP=$t TMPPREFIX=$t/zsh
     unset t
 }