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

diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index 7e0d2f3..85458f9 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: Mit Jul 25 15:02:01 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,22 +24,14 @@
 # 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`
-  [ -z "$USER" ]          && export USER=`id -un`
-  [[ $LOGNAME == LOGIN ]] && LOGNAME=$(id -un)
+  [ -z "$HOSTNAME" ]      && export HOSTNAME=$(hostname)
+  # make sure /usr/bin/id is available
+  if [ -x /usr/bin/id ] ; then
+     [ -z "$USER" ]          && export USER=$(/usr/bin/id -un)
+     [[ $LOGNAME == LOGIN ]] && LOGNAME=$(/usr/bin/id -un)
+  fi
 
 # workaround for live-cd mode as $HOME is not set via rungetty
   if [ -f /etc/grml_cd ] ; then
@@ -81,9 +73,22 @@
 
 # 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}
 
+# support termcap colors when using PAGER=less:
+  export LESS_TERMCAP_mb=$'\E[01;31m'
+  export LESS_TERMCAP_md=$'\E[01;31m'
+  export LESS_TERMCAP_me=$'\E[0m'
+  export LESS_TERMCAP_se=$'\E[0m'
+  export LESS_TERMCAP_so=$'\E[01;44;33m'
+  export LESS_TERMCAP_ue=$'\E[0m'
+  export LESS_TERMCAP_us=$'\E[01;32m'
+
 # allow zeroconf for distcc
   export DISTCC_HOSTS="+zeroconf"