X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=etc%2Fzsh%2Fzshenv;h=0ef72b2cfa23014ad9e6d4b9d55f7b33bfe0e70f;hb=8bdf3e57fdc82885826b23f7cd8c905b6331feb5;hp=0830328b08bbfab1782fa7b7247ed7ef676a1afb;hpb=aaebb85b04148aafcad855c310254b0568ddad72;p=grml-etc-core.git

diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index 0830328..0ef72b2 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: 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,
@@ -23,21 +23,18 @@
 
 # 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
+  [[ -r /etc/environment ]] && source /etc/environment
 
 # 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
+  if [[ -f /etc/grml_cd ]] ; then
     if (( EUID == 0 )); then
        export HOME=/root
     else
@@ -47,8 +44,8 @@
 
 # set $PATH
 # gentoo users have to source /etc/profile.env
-  if [ -r /etc/gentoo-release ] ; then
-     [ -r /etc/profile.env ] && source /etc/profile.env
+  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"
        else
@@ -56,22 +53,42 @@
        fi
   else
     # support extra software in special directory outside of squashfs environment in live-cd mode
-    if [ -f /etc/grml_cd ] ; then
-       [ -d /cdrom/addons/ ] && ADDONS=':/cdrom/addons/'
+    if [[ -f /etc/grml_cd ]] ; then
+       [[ -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"
     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.sh ]] ; then
+     export LESSOPEN="|lesspipe.sh %s"
+  elif [[ -x /usr/bin/lesspipe ]] ; then
+     export LESSOPEN="|lesspipe %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"