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

diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index 2ddcb2b..85458f9 100644
--- a/etc/zsh/zshenv
+++ b/etc/zsh/zshenv
@@ -3,35 +3,35 @@
 # 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: Don Okt 26 00:04:38 CEST 2006 [mika]
+# Latest change: Mit Jul 25 15:02:01 CEST 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
-  [ -n "$LC_MESSAGES" ]   && export LC_MESSAGES
-
-  [ -r /etc/sysconfig/keyboard ] && source /etc/sysconfig/keyboard
 
 # 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
@@ -61,14 +61,37 @@
     else
       PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin:/usr/local/sbin:/usr/local/bin:/usr/NX/bin$ADDONS"
     fi
-#  fi
   fi
 
+  # Solaris 
+  # case $(uname 2>/dev/null) in
+  #   SunOS)
+  #      PATH="/usr/bin:/usr/sbin:/usr/ccs/bin:/usr/sfw/bin:/opt/sfw/bin:/opt/bin:/usr/local/bin:/usr/openwin/bin:/usr/dt/bin:/usr/ucb:/usr/proc/bin:~/bin"
+  #      # LD_LIBRARY_PATH="/opt/csw/lib:/opt/sfw/lib:/usr/lib:/usr/local/lib:/usr/ccs/lib:/usr/openwin/lib:/usr/ucb/lib"
+  #      # MANPATH="$MANPATH:/opt/csw/man:/usr/man:/usr/share/man:/usr/local/man:/opt/sfw/man"
+  #esac
+
 # 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"
+
 # MAKEDEV should be usable on udev as well by default:
   export WRITE_ON_UDEV=yes