[SCM] live-helper branch, debian-next, updated. debian/2.0_a6-1-4-g7f1599d

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 7f1599d2187bf003165baf375b08db36465a6bec
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Mon Feb 1 12:36:00 2010 +0100

    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.

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)" ]

-- 
live-helper