X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshenv;h=f6d1e422014d6a3cc4aedcb9c9e7e0f9cfd413ab;hb=eeb9806fb104a1e72e9f36d9fa6f7be8c7d56bd6;hp=26c1e8381a1f4083f99d9c98dfa0cd819588ce85;hpb=fdc8e8a0089fc457478464f8cbe4b89a813b27fc;p=grml-etc-core.git

diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index 26c1e83..f6d1e42 100644
--- a/etc/zsh/zshenv
+++ b/etc/zsh/zshenv
@@ -3,35 +3,42 @@
 # 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: Sam Mär 17 12:51:25 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
-# set within this file, all other initialization files
-# are skipped.
+# It is the 1st file zsh reads; it's read for every shell,
+# even if started with -f (setopt NO_RCS), all other
+# initialization files are skipped.
 #
 # This file should contain commands to set the command
 # search path, plus other important environment variables.
 # This file should not contain commands that produce
 # output or assume the shell is attached to a tty.
 #
+# Notice: .zshenv is the same, execpt that it's not read
+# if zsh is started with -f
+#
 # Global Order: zshenv, zprofile, zshrc, zlogin
 ################################################################################
 
 # language settings (read in /etc/environment before /etc/default/locale as
 # 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 "$LC_ALL" ]        && export LC_ALL #     || export LC_ALL="$LANG"
+  if [ -n "$LANG" ]  ; then
+     export LANG
+  else
+     [ -r /etc/default/locale ] && source /etc/default/locale
+  fi
+  [ -n "$LANG" ]          && export LANG || export LANG="en_US.iso885915"
+  [ -n "$LC_ALL" ]        && export LC_ALL
   [ -n "$LC_MESSAGES" ]   && export LC_MESSAGES
 
   [ -r /etc/sysconfig/keyboard ] && source /etc/sysconfig/keyboard
+  [ -r /etc/timezone ] && TZ=$(cat /etc/timezone)
 
 # 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
@@ -48,7 +55,7 @@
   if [ -r /etc/gentoo-release ] ; then
      [ -r /etc/profile.env ] && source /etc/profile.env
        if (( EUID != 0 )); then
-          PATH="$HOME/bin:/bin/:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/games:/usr/NX/bin:$PATH"
+          PATH="$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/games:/usr/NX/bin:$PATH"
        else
           PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin:/usr/local/sbin:/usr/local/bin:/usr/NX/bin:$PATH"
        fi
@@ -58,7 +65,7 @@
        [ -d /cdrom/addons/ ] && ADDONS=':/cdrom/addons/'
     fi
     if (( EUID != 0 )); then
-      PATH="$HOME/bin:/bin/:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/games:/usr/NX/bin$ADDONS"
+      PATH="$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/games:/usr/NX/bin$ADDONS"
     else
       PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin:/usr/local/sbin:/usr/local/bin:/usr/NX/bin$ADDONS"
     fi
@@ -69,7 +76,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