zshenv: clarify some comments

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

diff --git a/etc/zsh/.zshenv b/etc/zsh/.zshenv
index 2cbb88a06810125fdd714d8f5242efe6aacb71dc..bf8af5662fc0c89e6fb4714954696b4c33406cfb 100644 (file)
--- a/etc/zsh/.zshenv
+++ b/etc/zsh/.zshenv
@@ -86,7 +86,7 @@ function _sev_setpath {
     # shift valid system paths to the front if there are any left
     ((len > 0 && len < $#path)) && path=("${(@)path[len + 1, -1]}" "${(@)path[1, len]}")
     # include our zsh dir in fpath. unlike above, we always prefer our paths
-    fpath=({${ZDOTDIR:-~/.zsh},{${_sev_home:-~},~}/.zsh}/functions/**/*(/N) "$fpath[@]")
+    fpath=({${ZDOTDIR:-{${_sev_home:-~},~}/.zsh},{${_sev_home:-~},~}/.zsh}/functions/**/*(/N) "$fpath[@]")
     # remove bad paths
     for (( i = 1; i <= $#fpath; i++ )) {
         if [[ ! -d $fpath[$i] ]] {
@@ -127,14 +127,17 @@ if [[ ! -v _sev_setup_path || -o login ]] {
     # NOTE: do not set _sev_setup_path, it is set in zprofile
 }
 
-### home dir setup & exports
+### home dir setup & additional exports
 # XXX: traditionally, zshenv should just contain exports, and not touch the
-#      filesystem. however, some system profile scripts that are sourced in the
-#      system zprofile may attempt to do things that rely on some of these
-#      vars. for example, `flatpak-bindir.sh` in the Arch Linux flatpak package
-#      references $XDG_DATA_HOME with no fallback. since we do special handling
-#      for these vars before we export them, we're forced to do it all here
-#      instead of zprofile.
+#      filesystem. however, our TMPDIR and XDG vars rely on mutable user paths
+#      that may not exist, and as such need to be set up before the rest of the
+#      system can use them. this is important as some environments include code
+#      in the global zprofile, or source scripts of other shells in the global
+#      zprofile, that may rely on our desired dir structure and vars pointing
+#      to it. for example, `flatpak-bindir.sh` in the Arch Linux flatpak
+#      package references $XDG_DATA_HOME with no fallback. since we do special
+#      handling for these vars before we export them, we're forced to do it all
+#      here instead of at the top of the zprofile.
 
 ## xdg local dir
 # NOTE: need this for tmp, so confirm it exists.
@@ -152,11 +155,15 @@ if [[ ! -v _sev_setup_path || -o login ]] {
 #       though it is not expressly spec compliant. this may also cause problems
 #       with disowned applications that still try to use the directories after
 #       the toplevel shell has already logged out and the dirs removed, but the
-#       chances of that are slim.
+#       chances of that are slim. this also needs to be adjusted for usermode
+#       Xorg, as it requires $PREFIX/tmp/.X11-unix on most installs.
 if [[ ! -v _sev_tmp ]] {
     _sev_tmp=~/.local/tmp
     # create personal TMPDIR under system tmp
-    t=${TMPDIR:-${TEMPDIR:-${TEMP:-${TMP:-${${TMPPREFIX%/zsh}:-/tmp}}}}}/.home-$LOGNAME
+    # NOTE: under proot with uid remapping, we can reuse old tmp, without
+    #       worrying about permission issues; intended for proot under termux.
+    # XXX: _sev_proot_old_user only works if /tmp is shared!
+    t=${TMPDIR:-${TEMPDIR:-${TEMP:-${TMP:-${${TMPPREFIX%/zsh}:-/tmp}}}}}/.home-${_sev_proot_old_username:-$LOGNAME}
     [[ -e $t ]] || mkdir -m700 $t 2>/dev/null
     if [[ ! -d $t ]] {
         # fallback TMPDIR to bare local directory or existing softlink
@@ -165,7 +172,7 @@ if [[ ! -v _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 ]] {
-            _sev_tmp=${$(mktemp 2>/dev/null):/tmp}
+            _sev_tmp=${$(mktemp 2>/dev/null):-/tmp}
             [[ -o interactive ]] &&
               print -P "%F{red}!!! Can't create tmp dir, using $_sev_tmp%f"
         }