projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply patches regarding zsh sourcing by ft
[grml-etc-core.git]
/
etc
/
skel
/
.zshrc
diff --git
a/etc/skel/.zshrc
b/etc/skel/.zshrc
index
7af2f0a
..
d2d5f79
100644
(file)
--- 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.
# 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 CES
T 2007 [mika]
+# Latest change:
Don Dez 06 23:27:51 CE
T 2007 [mika]
################################################################################
# source ~/.zshrc.global {{{
################################################################################
# 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:
# 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
# }}}
# 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
# }}}
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
# 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
# ...and remove utility functions again.
xunfunction