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 /scripts/build.sh | |
| 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 'scripts/build.sh')
| -rwxr-xr-x | scripts/build.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 500c76d50..fbe3e921f 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -2,18 +2,18 @@ if [ -e local/live-build ] then - LB_BASE="${LB_BASE:-${PWD}/local/live-build}" + LIVE_BUILD="${LIVE_BUILD:-${PWD}/local/live-build}" PATH="${PWD}/local/live-build/scripts/build:${PATH}" - export LB_BASE PATH -else - LB_BASE="${LB_BASE:-/usr/share/live/build}" - export LB_BASE + export LIVE_BUILD PATH fi # Source global functions -for FUNCTION in "${LB_BASE}"/functions/*.sh +for FUNCTION in "${LIVE_BUILD}"/functions/*.sh /usr/share/live/build/functions/*.sh do - . "${FUNCTION}" + if [ -e "${FUNCTION}" ] + then + . "${FUNCTION}" + fi done # Source local functions |