/etc/zsh/zshrc: don't export $SHELL anymore

/etc/zsh/zshenv: some minor code style improvements

diff --git a/debian/changelog b/debian/changelog
index 72ea5f0..d6f6a91 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ grml-etc-core (0.1-26) unstable; urgency=low
       function (thanks, Frank Terbeck!)
     - use zsh's color capabilities if the module is present
       (thanks, Frank Terbeck!)
+    - don't export $SHELL anymore
   * /etc/zsh/zshenv:
     - set /bin instead of /bin/ in $PATH
+    - some minor code style improvements
   * /etc/skel/.zshrc: 
     - updated alias fbmplayer (thanks, wuehlmaus!)
     - added function gex (google exact search, thanks wuehlmaus!)

diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index d33bb5d..2ddcb2b 100644 (file)
--- 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: Sam Sep 23 14:20:25 CEST 2006 [mika]
+# Latest change: Don Okt 26 00:04:38 CEST 2006 [mika]
 ################################################################################
 # This file is sourced on all invocations of the shell.
 # If the -f flag is present or if the NO_RCS option is
@@ -23,15 +23,14 @@
   [ -r /etc/environment    ] && source /etc/environment
   [ -r /etc/default/locale ] && source /etc/default/locale
   [ -n "$LANG" ]          && export LANG        || export LANG="en_US.iso885915"
-  [ -n "$LC_ALL" ]        && export LC_ALL #     || export LC_ALL="$LANG"
+  [ -n "$LC_ALL" ]        && export LC_ALL
   [ -n "$LC_MESSAGES" ]   && export LC_MESSAGES
 
   [ -r /etc/sysconfig/keyboard ] && source /etc/sysconfig/keyboard
 
 # set environment variables (important for autologin on tty)
-  [ -n "$HOSTNAME" ] || export HOSTNAME=`hostname`
-  [ -z "$USER" ]     && export USER=`id -un`
-
+  [ -z "$HOSTNAME" ]      && export HOSTNAME=`hostname`
+  [ -z "$USER" ]          && export USER=`id -un`
   [[ $LOGNAME == LOGIN ]] && LOGNAME=$(id -un)
 
 # workaround for live-cd mode as $HOME is not set via rungetty

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 99642aa..df82488 100644 (file)
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -55,7 +55,7 @@
 
 # {{{ set some variables
   export EDITOR=${EDITOR:-vim}
-  export SHELL=${SHELL:-/bin/zsh}
+#  export SHELL=${SHELL:-/bin/zsh}
   export MAIL=${MAIL:-/var/mail/$USER}
   [[ -f ~/.terminfo/m/mostlike ]] && MYLESS='LESS=C TERMINFO=~/.terminfo TERM=mostlike less' || MYLESS='less'
   [[ -x /usr/bin/dircolors ]] && eval `dircolors -b`