From 382aa5b14b992e88caafccbfd58482d0ce27e35d Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 13 Feb 2009 13:24:59 +0100 Subject: [PATCH] zshrc: provide upgrade path via /etc/skel/.zshrc --- debian/changelog | 3 ++- etc/skel/.zshrc | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6aad3c6..3e63cc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ grml-etc-core (0.3.62) unstable; urgency=low * /etc/grml/screenrc: - re-enable keybindings '^\' and '\\' for exiting screen with query (thanks, gebi) + * zshrc: provide upgrade path via /etc/skel/.zshrc [ Frank Terbeck ] * zshrc: Big setup merge: /etc/zsh/zshrc + /etc/skel/.zshrc into one file @@ -23,7 +24,7 @@ grml-etc-core (0.3.62) unstable; urgency=low Jan-Hendrik Zab. * zshrc: add '-f' option to xtrename(), thanks esc. - -- Michael Prokop Fri, 13 Feb 2009 12:37:17 +0100 + -- Michael Prokop Fri, 13 Feb 2009 13:24:23 +0100 grml-etc-core (0.3.61) unstable; urgency=low diff --git a/etc/skel/.zshrc b/etc/skel/.zshrc index 9e60f1d..2cee09b 100644 --- a/etc/skel/.zshrc +++ b/etc/skel/.zshrc @@ -15,6 +15,18 @@ # Adjustments would still go to the .zshrc.local file. ################################################################################ +## Upgrade path for old zshrc layout, assuming +## /etc/skel/.zshrc installed as .zshrc and +## /etc/zsh/zshrc installed as .zshrc.global +## and no ~/.zshrc.local exists yet. +if [ -r ~/.zshrc -a -r ~/.zshrc.global -a ! -r ~/.zshrc.local ] ; then + printf '-!-\n' + printf '-!- Looks like you are using the old zshrc layout of grml.\n' + printf '-!- Please read the notes in ~/.zshrc and ~/.zshrc.global\n' + printf '-!- and/or check out grml-zsh-refcard at http://grml.org/zsh/\n' + printf '-!-\n' +fi + ## Now, we'll give a few examples of what you might want to use in your ## .zshrc.local file (just copy'n'paste and uncomment it there): -- 2.1.4