zshrc: source ~/.zshrc.local for root, too

This also fixes a missing Closes: in debian/changelog.

diff --git a/debian/changelog b/debian/changelog
index b1db8fe..09de354 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,13 +4,15 @@ grml-etc-core (0.3.65) UNRELEASED; urgency=low
   * zshrc: Add $NOTITLE to disable alteration of terminal titles.
     Based on an idea by Timo Boettcher.
   * zshrc: Cleaned up abbreviations by Alexander Steinböck.
+    [Closes: issue642]
+  * zshrc: source ~/.zshrc.local for root, too.
 
   [ Michael Prokop ]
   * vimrc: add check for $NOPRECMD [Closes: issue447]
   * zshrc: use 'setopt noglobdots' as [Open]SuSE uses in its
     /etc/zshrc 'setopt globdots' by default.
 
- -- Michael Prokop <mika@grml.org>  Sat, 07 Mar 2009 00:54:07 +0100
+ -- Frank Terbeck <ft@grml.org>  Sun, 08 Mar 2009 18:30:04 +0100
 
 grml-etc-core (0.3.64) unstable; urgency=low
 

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 125d0f7..3dffc29 100644 (file)
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -443,6 +443,13 @@ xunfunction() {
     return 0
 }
 
+# this allows us to stay in sync with grml's zshrc and put own
+# modifications in ~/.zshrc.local
+zrclocal() {
+    xsource "${HOME}/.zshrc.local"
+    return 0
+}
+
 #}}}
 
 # locale setup {{{
@@ -2922,7 +2929,11 @@ fi
 ### non-root (EUID != 0) code below
 ###
 
-(( GRML_ALWAYS_LOAD_ALL == 0 )) && (( $EUID == 0 )) && return 0
+if (( GRML_ALWAYS_LOAD_ALL == 0 )) && (( $EUID == 0 )) ; then
+    zrclocal
+    return 0
+fi
+
 
 # variables {{{
 
@@ -4202,14 +4213,7 @@ fi
 
 #}}}
 
-# finally source a local zshrc {{{
-
-# this allows us to stay in sync with grml's zshrc and put own
-# modifications in ~/.zshrc.local
-
-xsource "${HOME}/.zshrc.local"
-
-# }}}
+zrclocal
 
 ## genrefcard.pl settings {{{