X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshenv;h=a0679158ac247af76023a96ad0834bed8d3bbbf1;hb=d057c82c5819bca55dfb12c9ba197b5f4ddbdcce;hp=7e0d2f3967b7ef536845564c50374f1997bc84df;hpb=ae1db734c9bd60f5d5617a943b88aaa65f8b2249;p=grml-etc-core.git

diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index 7e0d2f3..a067915 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 Mär 17 12:51:25 CET 2007 [mika]
+# Latest change: Die Jul 17 23:23:26 CEST 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,17 +24,6 @@
 # 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
-  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`
@@ -81,7 +70,11 @@
 
 # less (:=pager) options:
 #  export LESS=C
-  export LESSOPEN="|lesspipe.sh %s"
+  if [ -x /usr/bin/lesspipe ] ; then
+     export LESSOPEN="|lesspipe %s"
+  elif [ -x /usr/bin/lesspipe.sh ] ; then
+     export LESSOPEN="|lesspipe.sh %s"
+  fi
   export READNULLCMD=${PAGER:-/usr/bin/pager}
 
 # allow zeroconf for distcc