diff --git a/packages/z/zsh/files/zprofile b/packages/z/zsh/files/zprofile index 79b93d0a12a..503a8c7e3bf 100644 --- a/packages/z/zsh/files/zprofile +++ b/packages/z/zsh/files/zprofile @@ -4,48 +4,5 @@ elif [ -f /etc/zsh/zprofile ]; then source /etc/zsh/zprofile fi -# Source paths that may not be included by systemctl -if [ -f /usr/share/defaults/etc/profile.d/10-path.sh ]; then - emulate sh -c 'source /usr/share/defaults/etc/profile.d/10-path.sh' -fi - -# Source paths not included by systemctl necessary for XDG_DATA_DIRS - -if [ -f /usr/share/defaults/etc/profile.d/10-xdg.sh ]; then - emulate sh -c 'source /usr/share/defaults/etc/profile.d/10-xdg.sh' -fi - -# Source paths not included by systemctl necessary for flatpaks to be found in the app menu and run - -if [ -f /usr/share/defaults/etc/profile.d/70-flatpak.sh ]; then - emulate sh -c 'source /usr/share/defaults/etc/profile.d/70-flatpak.sh' -fi - -# Source paths not included by systemctl necessary for snaps to be found in the app menu and run - -if [ -f /usr/share/defaults/etc/profile.d/70-snapd.sh ]; then - emulate sh -c 'source /usr/share/defaults/etc/profile.d/70-snapd.sh' -fi - -# Source gtk modules variable for menus - -if [ -f /usr/share/defaults/etc/profile.d/appmenu-gtk2-module.sh ]; then - emulate sh -c 'source /usr/share/defaults/etc/profile.d/appmenu-gtk2-module.sh' -fi - -# Paths for gawk - -if [ -f /usr/share/defaults/etc/profile.d/gawk.sh ]; then - emulate sh -c 'source /usr/share/defaults/etc/profile.d/gawk.sh' -fi - -# Environment for vte, zsh compatible - -if [ -f /usr/share/defaults/etc/profile.d/vte.sh ]; then - source /usr/share/defaults/etc/profile.d/vte.sh -fi - -# Do not source /etc/profile as Arch does -# This will source all other bash scripts in /etc/profile.d, some of which may not load properly. -# Some may also conflict with zsh frameworks or have other unintended consequences -# Additionally, Solus sources ~/.bashrc.d from /etc/profile which is not obvious to the user or expected in zsh +# This should always be sourced regardless of the above files +emulate sh -c 'source /usr/share/defaults/etc/profile' diff --git a/packages/z/zsh/package.yml b/packages/z/zsh/package.yml index 68cc153d115..66debcf9a45 100644 --- a/packages/z/zsh/package.yml +++ b/packages/z/zsh/package.yml @@ -1,6 +1,6 @@ name : zsh version : '5.9' -release : 34 +release : 35 source : - https://sourceforge.net/projects/zsh/files/zsh/5.9/zsh-5.9.tar.xz : 9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5 homepage : https://www.zsh.org/ diff --git a/packages/z/zsh/pspec_x86_64.xml b/packages/z/zsh/pspec_x86_64.xml index 7d13879164a..cc7d0b16329 100644 --- a/packages/z/zsh/pspec_x86_64.xml +++ b/packages/z/zsh/pspec_x86_64.xml @@ -1397,8 +1397,8 @@ - - 2024-11-11 + + 2024-11-12 5.9 Packaging update Tracey Clark