summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-08-13 12:23:34 +0200
committerDaniel Baumann <daniel@debian.org>2012-08-13 12:23:34 +0200
commitc68e06fb6b393755e88375cbaa2873aa2bc5c70f (patch)
tree27cb1f86e22a542f08ab53d0f2a186a10b931b80 /bin
parent31d966cb49f6f952bfe710012a6cd643062d5803 (diff)
downloadvyos-live-build-c68e06fb6b393755e88375cbaa2873aa2bc5c70f.tar.gz
vyos-live-build-c68e06fb6b393755e88375cbaa2873aa2bc5c70f.zip
Simplyfing sourcing of build.sh and getting away with the broken subshell construct.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/lb2
-rwxr-xr-xbin/live-build2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/lb b/bin/lb
index 5cffbaa1d..8ee1007f7 100755
--- a/bin/lb
+++ b/bin/lb
@@ -11,7 +11,7 @@
set -e
# Including common functions
-( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+. "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || . /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 94a54c305..7a9aedd68 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 || true ) || . /usr/lib/live/build.sh
+. "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || . /usr/lib/live/build.sh
if [ -x "$(which man 2>/dev/null)" ]
then