From 59e9a93ad08c171fb0d22e965c56f91c5bd17615 Mon Sep 17 00:00:00 2001
From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Date: Mon, 1 Feb 2010 12:36:00 +0100
Subject: For lh_local, checking first for helpers in LH_BASE.

lh_local sets PATH and LH_BASE. However the live-helper wrapper script
looks for helper script in the system path (/usr/share/live-helper/helpers)
before looking for them in the PATH.

This patch thus instructs lh to first adds test under LH_BASE, if set.
---
 helpers/lh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/helpers/lh b/helpers/lh
index ecf9b4a..c22f554 100755
--- a/helpers/lh
+++ b/helpers/lh
@@ -34,7 +34,10 @@ case "${1}" in
 		COMMAND="${1}"
 		shift
 
-		if [ -x /usr/share/live-helper/helpers/lh_${COMMAND} ]
+		if [ -x "${LH_BASE}/helpers/lh_${COMMAND}" ]
+		then
+			LH=1 exec "${LH_BASE}/helpers/lh_${COMMAND}" "${@}"
+		elif [ -x /usr/share/live-helper/helpers/lh_${COMMAND} ]
 		then
 			LH=1 exec /usr/share/live-helper/helpers/lh_"${COMMAND}" "${@}"
 		elif [ -x "$(which lh_${COMMAND} 2>/dev/null)" ]
-- 
cgit v1.0