zsh: fixup env vars and update a comment

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

diff --git a/etc/zsh/.zshenv b/etc/zsh/.zshenv
index f961cfb48a39556245220ce0971432844690fad2..0d5807653c59b448bc2d955484c902d1b69fe212 100644 (file)
--- a/etc/zsh/.zshenv
+++ b/etc/zsh/.zshenv
@@ -3,6 +3,8 @@
 # XXX: only call after relevant vars have been set up, defined early so that
 #      below code can utilize it after they do so
 function _sev_zcleanup {
+    local x p y
+
     # gpg forwarding
     if [[ -d $_sev_gpg_forward_dir && ( -z $1 || $1 == 'gpg-forward' ) ]] {
         # clean up forward dirs if its session is dead or we ask for it
@@ -25,7 +27,7 @@ function _sev_zcleanup {
             }
         }
         # reset GNUPGHOME if we removed our own dir
-        if [[ $GNUPGHOME =~ '/.ssh_forward/\d+/*$' && ! -e $GNUPGHOME ]]
+        if [[ $GNUPGHOME =~ '/.ssh_forward/\d+/*$' && ! -d $GNUPGHOME ]]
             GNUPGHOME=${GNUPGHOME%$MATCH}
     }
 
@@ -46,8 +48,6 @@ function _sev_zcleanup {
             }
         }
     }
-
-    unset x p y
 }
 
 function _sev_setpath {
@@ -55,18 +55,19 @@ function _sev_setpath {
     #       remove any further occurences to capture elements from the old PATH
     #       that we did not anticipate and shift them to the front, since they are
     #       probably important to the system
+    # NOTE: tied arrays path and fpath already exist
     typeset -gU path fpath
     # add as many generic paths as possible to keep the order we want
     # NOTE: /usr/{local,pkg,games} are unix/bsdisms
     # XXX: PREFIX not validated, non-posix but Termux uses it, maybe others
     # XXX: XDG specifies ~/.local/bin as the only user-writable dir for
     #      executables, but we specify more; technically this is against spec
-    syspath=("$path[@]")
-    path=({{${_sev_home:-~},~}{/.local,},{$PREFIX,}{,/opt,/usr{,/local,/pkg}}}/{s,}bin
+    local -a syspath=("$path[@]")
+    path=({{${_sev_home:-~},~}{/.local,},{$PREFIX,}{,/opt,/opt/*{/*,},/usr{,/local,/pkg}}}/{s,}bin(N)
           {$PREFIX,}/usr/{X11R{7,6}/bin,games}
           # emulate Arch Linux flatpak-bindir.sh for use on other systems
           {${XDG_DATA_HOME:-~/.local/share},{$PREFIX,}/var/lib}/flatpak/exports/bin)
-    ((len=$#path))
+    local -i i len=$#path
     path=("$path[@]" "$syspath[@]")
     # remove bad paths
     for (( i = 1; i <= $#path; i++ )) {
@@ -214,8 +215,7 @@ if [[ ! -v _sev_setup_xdg ]] {
         mkdir -m760 ~/.local/share
     }
     xdg_data_dirs=($XDG_DATA_HOME /{opt,usr/local,usr/pkg,usr}/share
-      ${XDG_DATA_DIRS:+"$xdg_data_dirs[@]"})
-    xdg_data_dirs=${xdg_data_dirs:#}
+      ${XDG_DATA_DIRS:+${xdg_data_dirs%%/}})
     export XDG_DATA_DIRS
 
     typeset -UT XDG_CONFIG_DIRS xdg_config_dirs
@@ -226,9 +226,9 @@ if [[ ! -v _sev_setup_xdg ]] {
     }
     # I am of the belief .local should follow FHS /usr/local...
     [[ -e ~/.local/etc ]] || ln -s ~/.config ~/.local/etc
-    xdg_config_dirs=($XDG_CONFIG_HOME ${XDG_CONFIG_DIRS:+"$xdg_config_dirs[@]"}
+    xdg_config_dirs=($XDG_CONFIG_HOME
+      ${XDG_CONFIG_DIRS:+${xdg_config_dirs%%/}}
       {/opt,/usr/local,/usr/pkg,}/etc/xdg)
-    xdg_config_dirs=${xdg_config_dirs:#}
     export XDG_CONFIG_DIRS
 
     if [[ -v XDG_STATE_HOME ]] {