X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshenv;h=f6d1e422014d6a3cc4aedcb9c9e7e0f9cfd413ab;hb=eeb9806fb104a1e72e9f36d9fa6f7be8c7d56bd6;hp=0830328b08bbfab1782fa7b7247ed7ef676a1afb;hpb=aaebb85b04148aafcad855c310254b0568ddad72;p=grml-etc-core.git

diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index 0830328..f6d1e42 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: Sam Feb 24 18:59:11 CET 2007 [mika]
+# Latest change: Sam Mär 17 12:51:25 CET 2007 [mika]
 ################################################################################
 # This file is sourced on all invocations of the shell.
 # It is the 1st file zsh reads; it's read for every shell,
@@ -24,12 +24,17 @@
 # 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
+  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)
   [ -z "$HOSTNAME" ]      && export HOSTNAME=`hostname`