zshenv: be paranoid, try not to clobber $t var

[dotfiles.git] / etc / zsh / .zshenv

diff --git a/etc/zsh/.zshenv b/etc/zsh/.zshenv
index b1ae0fdbddcdaaf533e6d4fd9394ecf2ec1c94f7..29f59e7375f8dc28af7b9fc1f866ba88f154d568 100644 (file)
--- a/etc/zsh/.zshenv
+++ b/etc/zsh/.zshenv
@@ -168,12 +168,12 @@ if [[ ! -v _sev_tmp ]] {
     # create personal TMPDIR under system tmp
     # NOTE: under proot with uid remapping and shared /tmp, we can reuse old
     #       dir, without worrying about permission issues; intended for termux.
     # create personal TMPDIR under system tmp
     # NOTE: under proot with uid remapping and shared /tmp, we can reuse old
     #       dir, without worrying about permission issues; intended for termux.

-    t=${TMPDIR:-${TEMPDIR:-${TEMP:-${TMP:-${${TMPPREFIX%/zsh}:-/tmp}}}}}/.home-${_sev_proot_real_user:-$LOGNAME}
-    [[ -e $t ]] || mkdir -m700 $t 2>/dev/null
-    if [[ ! -d $t ]] {
+    _t=${TMPDIR:-${TEMPDIR:-${TEMP:-${TMP:-${${TMPPREFIX%/zsh}:-/tmp}}}}}/.home-${_sev_proot_real_user:-$LOGNAME}
+    [[ -e $_t ]] || mkdir -m700 $_t 2>/dev/null
+    if [[ ! -d $_t ]] {

         # fallback TMPDIR to bare local directory or existing softlink
         [[ -o interactive ]] &&
         # fallback TMPDIR to bare local directory or existing softlink
         [[ -o interactive ]] &&

-          print -P "%F{orange}*** Can't create tmp dir $t, using $_sev_tmp%f"
+          print -P "%F{orange}*** Can't create tmp dir $_t, using $_sev_tmp%f"

         [[ -h $_sev_tmp && ! -d _sev_tmp ]] && unlink $_sev_tmp 2>/dev/null
         [[ ! -e $_sev_tmp ]] && mkdir -m700 $_sev_tmp 2>/dev/null
         if [[ ! -d $_sev_tmp ]] {
         [[ -h $_sev_tmp && ! -d _sev_tmp ]] && unlink $_sev_tmp 2>/dev/null
         [[ ! -e $_sev_tmp ]] && mkdir -m700 $_sev_tmp 2>/dev/null
         if [[ ! -d $_sev_tmp ]] {


@@ -184,10 +184,10 @@ if [[ ! -v _sev_tmp ]] {
     } elif [[ -e $_sev_tmp && ! -h $_sev_tmp ]] {
         # non-softlink node is on our local dir
         [[ -o interactive ]] &&
     } 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
+          print -P "%F{orange}*** $_sev_tmp exists, can't link to tmp dir $_t, ignoring it%f"
+        _sev_tmp=$_t

     } else {
     } else {

-        if [[ ! -v $_sev_tmp_keep_link && -h $_sev_tmp && $_sev_tmp:P != $t:P ]] {
+        if [[ ! -v $_sev_tmp_keep_link && -h $_sev_tmp && $_sev_tmp:P != $_t:P ]] {

             [[ -o interactive ]] &&
               print -P "%F{orange}*** $_sev_tmp links to ${_sev_tmp:P} and not ${t:P}, unlinking it%f"
             # NOTE: ln -f doesn't seem to work reliably with softlink
             [[ -o interactive ]] &&
               print -P "%F{orange}*** $_sev_tmp links to ${_sev_tmp:P} and not ${t:P}, unlinking it%f"
             # NOTE: ln -f doesn't seem to work reliably with softlink


@@ -198,20 +198,20 @@ if [[ ! -v _sev_tmp ]] {
         }
         if [[ ! -e $_sev_tmp ]] {
             # link local dir to tmp dir
         }
         if [[ ! -e $_sev_tmp ]] {
             # link local dir to tmp dir

-            ln -s $t $_sev_tmp 2>/dev/null
+            ln -s $_t $_sev_tmp 2>/dev/null

         }
     }
     # ensure dir is clean
     _sev_zcleanup tmp
     # finally create our subdir for this session
         }
     }
     # 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
+    _t=$_sev_tmp/.session.$$
+    if ! mkdir -m700 $_t 2>/dev/null; then

         [[ -o interactive ]] &&
         [[ -o interactive ]] &&

-          print -P "%F{red}!!! Can't create session tmp subdir $t, using $_sev_tmp%f"
-        t=$_sev_tmp
+          print -P "%F{red}!!! Can't create session tmp subdir $_t, using $_sev_tmp%f"
+        _t=$_sev_tmp

     fi
     fi

-    export _sev_tmp TMPDIR=$t TEMPDIR=$t TEMP=$t TMP=$t TMPPREFIX=$t/zsh
-    unset t
+    export _sev_tmp TMPDIR=$_t TEMPDIR=$_t TEMP=$_t TMP=$_t TMPPREFIX=$_t/zsh
+    unset _t

 }
 
 ## xdg
 }
 
 ## xdg