From: Michael Prokop <mika@grml.org>
Date: Mon, 22 Sep 2014 10:21:32 +0000 (+0200)
Subject: zshenv: update live system paths for usage of $ADDONS inside $PATH
X-Git-Tag: v0.10.1~3
X-Git-Url: http://git.grml.org/?p=grml-etc-core.git;a=commitdiff_plain;h=59deaccbbfb3079065c1f9743fea04977c4b02c0

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

Neither /cdrom/addons nor /live/image/addons exists
in todays live systems. The addons also usually don't
contain any executables, so there's no point in adding
this directory to $PATH, instead support the scripts
directory which is useful with custom scripts without
having to fully remaster the Grml ISO.
---

diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index bf6c819..a049c7f 100644
--- a/etc/zsh/zshenv
+++ b/etc/zsh/zshenv
@@ -55,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