diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-08-27 15:52:29 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-08-27 16:05:48 +0200 |
| commit | d6e45a34376c9c80d1488ad4f3c9c1f85bedb338 (patch) | |
| tree | 204156d87b5ae6dcd21dad8797db34c6a585f102 /bin | |
| parent | de27a82a67ee51ce93448bcdee8ea54b3aa2f0b6 (diff) | |
| download | vyos-live-build-d6e45a34376c9c80d1488ad4f3c9c1f85bedb338.tar.gz vyos-live-build-d6e45a34376c9c80d1488ad4f3c9c1f85bedb338.zip | |
Making build.sh sourcing more robust (Closes: #684896).
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/lb | 2 | ||||
| -rwxr-xr-x | bin/live-build | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -11,7 +11,7 @@ set -e # Including common functions -. "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || . /usr/lib/live/build.sh +[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh # Setting static variables DESCRIPTION="$(Echo 'utility to build Debian Live systems')" diff --git a/bin/live-build b/bin/live-build index 7a9aedd68..d7eb28f66 100755 --- a/bin/live-build +++ b/bin/live-build @@ -23,7 +23,7 @@ set -e # Including common functions -. "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || . /usr/lib/live/build.sh +[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh if [ -x "$(which man 2>/dev/null)" ] then |