diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-08-27 14:55:15 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-08-27 15:03:21 +0200 |
| commit | d0561821e401346fe29d56e1264c235fed77ae87 (patch) | |
| tree | 815475185718ea1e378a7796b8aa55aca9c8d6f5 | |
| parent | 365e4c81c5392b17f39f76f49e3bb581ac830568 (diff) | |
| download | vyos-live-build-d0561821e401346fe29d56e1264c235fed77ae87.tar.gz vyos-live-build-d0561821e401346fe29d56e1264c235fed77ae87.zip | |
Calling local live-build embedded in config directly rather than to adjust path.
| -rwxr-xr-x | bin/lb | 4 | ||||
| -rwxr-xr-x | functions/defaults.sh | 3 | ||||
| -rwxr-xr-x | scripts/build.sh | 3 |
3 files changed, 6 insertions, 4 deletions
@@ -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 90d3ac416..b18d46549 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 fbe3e921f..b8846a4a2 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 |