From bf5493f17cbb327221eb800a43f1abfc93540322 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Sat, 24 Feb 2007 17:33:32 +0100
Subject: [PATCH] export SHELL=/bin/zsh

---
 debian/changelog | 10 ++++++++++
 etc/zsh/zshenv   |  7 +++++--
 etc/zsh/zshrc    | 14 ++++++++------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e11d879..470a07b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+grml-etc-core (0.2.23) unstable; urgency=low
+
+  * /etc/zsh/zshrc:
+    - export SHELL='/bin/zsh', otherwise aterm and rxvt use
+      /bin/sh or /bin/bash. :-/
+    - add a space character in some abbreviation expansions
+      so it's better readable.
+
+ -- Michael Prokop <mika@grml.org>  Sat, 24 Feb 2007 17:30:11 +0100
+
 grml-etc-core (0.2.22) unstable; urgency=low
 
   * Adding directory /etc/skel/.channels with the following files:
diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index 2ddcb2b..365b0db 100644
--- a/etc/zsh/zshenv
+++ b/etc/zsh/zshenv
@@ -3,7 +3,7 @@
 # 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: Don Okt 26 00:04:38 CEST 2006 [mika]
+# Latest change: Sam Feb 24 17:32:18 CET 2007 [mika]
 ################################################################################
 # This file is sourced on all invocations of the shell.
 # If the -f flag is present or if the NO_RCS option is
@@ -22,7 +22,7 @@
 # the latter one is the default on Debian nowadays)
   [ -r /etc/environment    ] && source /etc/environment
   [ -r /etc/default/locale ] && source /etc/default/locale
-  [ -n "$LANG" ]          && export LANG        || export LANG="en_US.iso885915"
+  [ -n "$LANG" ]          && export LANG || export LANG="en_US.iso885915"
   [ -n "$LC_ALL" ]        && export LC_ALL
   [ -n "$LC_MESSAGES" ]   && export LC_MESSAGES
 
@@ -68,7 +68,10 @@
 #  export LESS=C
   export LESSOPEN="|lesspipe.sh %s"
   export READNULLCMD=${PAGER:-/usr/bin/pager}
+
+# allow zeroconf for distcc
   export DISTCC_HOSTS="+zeroconf"
+
 # MAKEDEV should be usable on udev as well by default:
   export WRITE_ON_UDEV=yes
 
diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 843b0f8..f45f936 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -3,7 +3,7 @@
 # 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: Son Jän 14 10:57:03 CET 2007 [mika]
+# Latest change: Sam Feb 24 17:32:43 CET 2007 [mika]
 ################################################################################
 # This file is sourced only for interactive shells. It
 # should contain commands to set up aliases, functions,
@@ -80,6 +80,8 @@
 # {{{ set some variables
   export EDITOR=${EDITOR:-vim}
   export MAIL=${MAIL:-/var/mail/$USER}
+  # if we don't set $SHELL then aterm, rxvt,.. will use /bin/sh or /bin/bash :-/
+  export SHELL='/bin/zsh'
   [[ -f ~/.terminfo/m/mostlike ]] && MYLESS='LESS=C TERMINFO=~/.terminfo TERM=mostlike less' || MYLESS='less'
   [[ -x /usr/bin/dircolors ]] && eval `dircolors -b`
 
@@ -154,18 +156,18 @@ fi
    '...' '../..'
    '....' '../../..'
    'BG' '& exit'
-   'C' '|wc -l'
+   'C' '| wc -l'
    'G' '|& grep --color=auto'
-   'H' '|head'
+   'H' '| head'
    'Hl' ' --help |& less -r'
-   'L' '|less'
+   'L' '| less'
    'LL' '|& less -r'
-   'M' '|most'
+   'M' '| most'
    'N' '&>/dev/null'
    'R' '| tr A-z N-za-m'
    'SL' '| sort | less'
    'S' '| sort -u'
-   'T' '|tail'
+   'T' '| tail'
    'V' '|& vim -'
    'hide' "echo -en '\033]50;nil2\007'"
    'tiny' 'echo -en "\033]50;-misc-fixed-medium-r-normal-*-*-80-*-*-c-*-iso8859-15\007"'
-- 
2.1.4