zsh: compact path glob, avoid double source

diff --git a/base/.zshenv b/base/.zshenv
index f6f0646c6db203ff132321249de281e916c87ad6..45ea3392b6130062cb6a8b789d38dcf4aee6099d 100644 (file)
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -24,7 +24,8 @@ if [[ ! -v _sev_first_display && ( -v DISPLAY || -v WAYLAND_DISPLAY ) ]] {
     #      exported; for example, this previously happened with sway without a
     #      display manager or launcher in front of it
     export _sev_first_display=
-    _sev_refresh_gpgagent= source ${ZDOTDIR:-~}/.zprofile
+    _sev_refresh_gpgagent=
+    [[ ! -o login ]] && source ${ZDOTDIR:-~}/.zprofile
 } elif [[ ! -o login && $SHLVL -eq 1 && ${+TERMUX_VERSION} -eq 0 ]] {
     ### early zprofile sourcing for first shell even if not a login shell
     source ${ZDOTDIR:-~}/.zprofile

diff --git a/etc/zsh/.zlogin b/etc/zsh/.zlogin
index 612209e531a74313cf938457c920a24508cb3cd8..8b4aab61354d771a0d9c61ddc91c626f6541ddbc 100644 (file)
--- a/etc/zsh/.zlogin
+++ b/etc/zsh/.zlogin
@@ -4,4 +4,4 @@
 if [[ -f ${ZDOTDIR:-~}/.zlogin.local ]] { source ${ZDOTDIR:-~}/.zlogin.local }
 
 ### cd for convenience
-[[ -o login ]] && cd ${_sev_home:-~}
+cd ${_sev_home:-~}

diff --git a/etc/zsh/.zprofile b/etc/zsh/.zprofile
index 9b93f41e22f8e4c97edcb52951fd6bd432fa7107..ec88809723eacd08a88e821ad8d30df720ceec57 100644 (file)
--- a/etc/zsh/.zprofile
+++ b/etc/zsh/.zprofile
@@ -79,9 +79,7 @@ if [[ ! -v _sev_setup_path || -o login ]] {
     # 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=(~/{.local/,}{s,}bin
-          {~/.local,{$PREFIX,}{,/opt,/usr{,/local,pkg}}}/sbin
-          {~/.local,{$PREFIX,}{,/opt,/usr{,/local,pkg}}}/bin
+    path=({{${_sev_home:-~},~}{/.local,},{$PREFIX,}{,/opt,/usr{,/local,/pkg}}}/{s,}bin
           /usr/{X11R{7,6}/bin,games})
     ((len=$#path))
     path=("$path[@]" "$syspath[@]")