zshenv: update live system paths for usage of $ADDONS inside $PATH

[grml-etc-core.git] / etc / zsh / zshenv

diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index 97a041c..a049c7f 100644 (file)
--- a/etc/zsh/zshenv
+++ b/etc/zsh/zshenv
@@ -3,7 +3,6 @@
 # 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 Mai 17 22:59:29 CEST 2008 [mika]
 ################################################################################
 # This file is sourced on all invocations of the shell.
 # It is the 1st file zsh reads; it's read for every shell,
@@ -56,11 +55,10 @@ if [[ -r /etc/gentoo-release ]] ; then
         PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin:/usr/local/sbin:/usr/local/bin:/usr/NX/bin:$PATH"
     fi
 else
-# support extra software in special directory outside of squashfs environment in live-cd mode
+    # support extra scripts/software in special directory outside of squashfs environment in live mode
     if [[ -f /etc/grml_cd ]] ; then
-       [[ -r /cdrom/addons ]]      && ADDONS=':/cdrom/addons'
-       [[ -r /live/image/addons ]] && ADDONS=':/live/image/addons'
-       [[ -r /etc/grml/my_path ]]  && ADDONS=":$(cat /etc/grml/my_path)"
+        [[ -r /lib/live/mount/medium/scripts ]] && ADDONS=':/lib/live/mount/medium/scripts'
+        [[ -r /etc/grml/my_path ]] && ADDONS=":$(cat /etc/grml/my_path)"
     fi
 
     if (( EUID != 0 )); then
@@ -80,11 +78,14 @@ esac
 
 # less (:=pager) options:
 #  export LESS=C
-if [[ -x /usr/bin/lesspipe.sh ]] ; then
-    export LESSOPEN="|lesspipe.sh %s"
-elif [[ -x /usr/bin/lesspipe ]] ; then
+typeset -a lp; lp=( ${^path}/lesspipe(N) )
+if (( $#lp > 0 )) && [[ -x $lp[1] ]] ; then
     export LESSOPEN="|lesspipe %s"
+elif [[ -x /usr/bin/lesspipe.sh ]] ; then
+    export LESSOPEN="|lesspipe.sh %s"
 fi
+unset lp
+
 export READNULLCMD=${PAGER:-/usr/bin/pager}
 
 # allow zeroconf for distcc