From: Christian Hofstaedtler <ch@grml.org>
Date: Sun, 24 Jul 2011 13:15:50 +0000 (+0200)
Subject: Revert "Make sure grmlzshrc is only loaded once"
X-Git-Tag: v0.4.01~9
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=5f0f906bd2a6d5d0f14094368089a69dfc6927ad;hp=7f2764810928cae8e6562b2a9db2cb344a937dbf;p=grml-etc-core.git

Revert "Make sure grmlzshrc is only loaded once"

This reverts commit 1dda332ef8a0fe126318794e6680e469e586835f.
This breaks interactively sourcing zshrc (wherever it is installed, or at all),
when it (or another version) was already loaded.

Another way of fixing the ".local is loaded twice" issue is under
discussion.
---

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index b8c950e..d5bbfa0 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -103,14 +103,6 @@
 #   *all* aliases, for example, use @@INSERT-aliases-all@@.
 #}}}
 
-# Only load once
-[[ ${(t)GRML} != *association* ]] && typeset -gA GRML
-if (( ${GRML[ZSHRC_LOADED]} )); then
-    return 0
-else
-    GRML[ZSHRC_LOADED]=1
-fi
-
 # zsh profiling {{{
 # just execute 'ZSH_PROFILE_RC=1 zsh' and run 'zprof' to get the details
 if [[ $ZSH_PROFILE_RC -gt 0 ]] ; then