From b16b540859e4b228722c5daa93c09220d68e0a9d Mon Sep 17 00:00:00 2001 From: Frank Terbeck Date: Sun, 17 May 2009 12:14:39 +0200 Subject: [PATCH] zshrc: source the global zshrc.local via zrclocal() This make sure it is always sourced when appropriate - along with other .local files and *before* the ~/.zshrc.local file. --- debian/changelog | 8 ++++++++ etc/zsh/zshrc | 5 +---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d899f8..468248d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +grml-etc-core (0.3.69) UNRELEASED; urgency=low + + * zshrc: properly source the global zshrc.local via zrclocal(), to + make sure it is always sourced when appropriate. Reported by + harnir, Thanks! + + -- Frank Terbeck Sun, 17 May 2009 12:05:47 +0200 + grml-etc-core (0.3.68) unstable; urgency=low [ Frank Terbeck ] diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 176fffb..9756914 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -448,6 +448,7 @@ xunfunction() { # this allows us to stay in sync with grml's zshrc and put own # modifications in ~/.zshrc.local zrclocal() { + xsource "/etc/zsh/zshrc.local" xsource "${HOME}/.zshrc.local" return 0 } @@ -2960,10 +2961,6 @@ exit 0; for color in BLUE RED GREEN CYAN YELLOW MAGENTA WHITE ; unset $color # }}} -# source another config file if present {{{ -xsource "/etc/zsh/zshrc.local" -# }}} - # "persistent history" {{{ # just write important commands you always need to ~/.important_commands if [[ -r ~/.important_commands ]] ; then -- 2.1.4