diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-07-19 19:37:26 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-07-19 21:11:59 +0200 |
| commit | 8473b925fd94fdb7bb1ae6309a4ab58d490382c9 (patch) | |
| tree | 94b76a6288395e37619b900f3eea2009a25d9b28 /bin | |
| parent | 6c0ddb7d6d72d15ab2887a4b40de2c5d71f26d3a (diff) | |
| download | vyos-live-build-8473b925fd94fdb7bb1ae6309a4ab58d490382c9.tar.gz vyos-live-build-8473b925fd94fdb7bb1ae6309a4ab58d490382c9.zip | |
Fixing up inclusion of functions while allowing local usage of live-build with different file layouts.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/lb | 11 | ||||
| -rwxr-xr-x | bin/live-build | 2 |
2 files changed, 4 insertions, 9 deletions
@@ -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 |