From 8473b925fd94fdb7bb1ae6309a4ab58d490382c9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Thu, 19 Jul 2012 19:37:26 +0200
Subject: Fixing up inclusion of functions while allowing local usage of
 live-build with different file layouts.

---
 bin/lb         | 11 +++--------
 bin/live-build |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'bin')

diff --git a/bin/lb b/bin/lb
index 6c92b746c..8cf9014a1 100755
--- a/bin/lb
+++ b/bin/lb
@@ -11,12 +11,7 @@
 set -e
 
 # Including common functions
-if [ -e "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh ]
-then
-	. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
-else
-	. /usr/lib/live/build.sh
-fi
+( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'utility to build Debian Live systems')"
@@ -58,9 +53,9 @@ case "${1}" in
 			fi
 		done
 
-		if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ]
+		if [ -x "${LIVE_BUILD}/scripts/build/${COMMAND}" ]
 		then
-			SCRIPT="${LB_BASE}/scripts/build/${COMMAND}"
+			SCRIPT="${LIVE_BUILD}/scripts/build/${COMMAND}"
 		elif [ -x /usr/lib/live/build/${COMMAND} ]
 		then
 			SCRIPT=/usr/lib/live/build/"${COMMAND}"
diff --git a/bin/live-build b/bin/live-build
index bb8d9620a..94a54c305 100755
--- a/bin/live-build
+++ b/bin/live-build
@@ -23,7 +23,7 @@
 set -e
 
 # Including common functions
-. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
+( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
 
 if [ -x "$(which man 2>/dev/null)" ]
 then
-- 
cgit v1.2.3