X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fskel%2F.zshrc;h=d2d5f79ef1abcfd1e6c44dbc08ec5f1e02cfcc93;hb=3b12b1642d0f5a66dd9e289258627ead082c3435;hp=7af2f0a91311ca4200b3aaf81363442f99b48086;hpb=d3f2ae885505d525fec84b17e7cdbadd4b8d712d;p=grml-etc-core.git

diff --git a/etc/skel/.zshrc b/etc/skel/.zshrc
index 7af2f0a..d2d5f79 100644
--- a/etc/skel/.zshrc
+++ b/etc/skel/.zshrc
@@ -3,19 +3,27 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mit Aug 08 21:22:03 CEST 2007 [mika]
+# Latest change: Don Dez 06 23:27:51 CET 2007 [mika]
 ################################################################################
 
 # source ~/.zshrc.global {{{
+
 # see /etc/zsh/zshrc for some general settings
 # If you don't have write permissions to /etc/zsh/zshrc on your own
 # copy the file to your $HOME as /.zshrc.global and we source it:
-xsource "${HOME}/.zshrc.global"
+
+# Note, that xsource() is defined in the global file, so here,
+# we will have to do the sourcing manually for once:
+
+     [[ -z "$ZSHRC_GLOBAL_HAS_BEEN_READ" ]]  \
+     && [[ -r "${HOME}/.zshrc.global" ]]     \
+         && source "${HOME}/.zshrc.global"
 # }}}
 
 # check whether global file has been read {{{
 if [[ -z "$ZSHRC_GLOBAL_HAS_BEEN_READ" ]] ; then
-    print 'Warning: global zsh config has not been read'>&2
+    print 'Warning: global zsh config has not been read.' >&2
+    print '         prepare for possible errors!'         >&2
 fi
 # }}}
 
@@ -1243,11 +1251,7 @@ gethgsnap() {
 # this allows us to stay in sync with /etc/skel/.zshrc
 # through 'ln -s /etc/skel/.zshrc ~/.zshrc' and put own
 # modifications in ~/.zshrc.local
-if type xsource &>/dev/null ; then
-    xsource "${HOME}/.zshrc.local"
-else
-    xsource "${HOME}/.zshrc.local"
-fi
+xsource "${HOME}/.zshrc.local"
 
 # ...and remove utility functions again.
 xunfunction