[SCM] live-build branch, debian-next, updated. debian/3.0_a57-1-21-gd056182
Daniel Baumann
daniel at debian.org
Mon Aug 27 13:03:29 UTC 2012
The following commit has been merged in the debian-next branch:
commit d0561821e401346fe29d56e1264c235fed77ae87
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Aug 27 14:55:15 2012 +0200
Calling local live-build embedded in config directly rather than to adjust path.
diff --git a/bin/lb b/bin/lb
index 7ea44cd..63c7498 100755
--- a/bin/lb
+++ b/bin/lb
@@ -57,6 +57,10 @@ case "${1}" in
then
# User has live-build copied locally in the system
SCRIPT="${LIVE_BUILD}/scripts/build/${COMMAND}"
+ elif [ -x "local/live-build/scripts/build/${COMMAND}" ]
+ then
+ # User has live-build embedded in the config
+ SCRIPT="local/live-build/scripts/build/${COMMAND}"
elif [ -x /usr/lib/live/build/${COMMAND} ]
then
# User has live-build installed in the system
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 90d3ac4..b18d465 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -15,8 +15,7 @@ Set_defaults ()
if [ -e local/live-build ]
then
LIVE_BUILD="${LIVE_BUILD:-${PWD}/local/live-build}"
- PATH="${PWD}/local/live-build/scripts/build:${PATH}"
- export LIVE_BUILD PATH
+ export LIVE_BUILD
fi
# Setting system type
diff --git a/scripts/build.sh b/scripts/build.sh
index fbe3e92..b8846a4 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -3,8 +3,7 @@
if [ -e local/live-build ]
then
LIVE_BUILD="${LIVE_BUILD:-${PWD}/local/live-build}"
- PATH="${PWD}/local/live-build/scripts/build:${PATH}"
- export LIVE_BUILD PATH
+ export LIVE_BUILD
fi
# Source global functions
--
live-build
More information about the debian-live-changes
mailing list