Simplyfing sourcing of build.sh and getting away with the broken subshell construct.

71 files changed, 71 insertions, 72 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
diff --git a/frontends/cgi/live-build-cgi b/frontends/cgi/live-build-cgi
index 9925fe567..9ab5d2dbf 100755
--- a/frontends/cgi/live-build-cgi
+++ b/frontends/cgi/live-build-cgi
@@ -9,7 +9,7 @@
 
 
 # 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
 
 # Reading defaults
 if [ -r /etc/default/live-build-cgi ]
diff --git a/frontends/cgi/live-build-cgi.cron b/frontends/cgi/live-build-cgi.cron
index 0035438e5..8e0e7ff87 100755
--- a/frontends/cgi/live-build-cgi.cron
+++ b/frontends/cgi/live-build-cgi.cron
@@ -9,7 +9,7 @@
 
 
 # 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
 
 # Reading defaults
 if [ -r /etc/default/live-build-cgi ]
diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary
index 600d8934d..4a110e5a9 100755
--- a/scripts/build/lb_binary
+++ b/scripts/build/lb_binary
@@ -11,8 +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
 
 # Automatically populating config tree
 if [ -x auto/config ] && [ ! -e .build/config ]
diff --git a/scripts/build/lb_binary_checksums b/scripts/build/lb_binary_checksums
index 7e9cda07d..baa0b4633 100755
--- a/scripts/build/lb_binary_checksums
+++ b/scripts/build/lb_binary_checksums
@@ -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 'create binary checksums')"
diff --git a/scripts/build/lb_binary_chroot b/scripts/build/lb_binary_chroot
index a39691c10..0b7fa067f 100755
--- a/scripts/build/lb_binary_chroot
+++ b/scripts/build/lb_binary_chroot
@@ -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 'copy chroot into chroot')"
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 667887a11..b3c3fd9ae 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -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 'install debian-installer into binary')"
diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk
index ce11019aa..e42a4becc 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -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 'install disk information into binary')"
diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub
index 5e1b2f7cd..4633b5fd8 100755
--- a/scripts/build/lb_binary_grub
+++ b/scripts/build/lb_binary_grub
@@ -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 'installs grub into binary')"
diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2
index c52428283..1f783f10a 100755
--- a/scripts/build/lb_binary_grub2
+++ b/scripts/build/lb_binary_grub2
@@ -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 'installs grub2 into binary')"
diff --git a/scripts/build/lb_binary_hdd b/scripts/build/lb_binary_hdd
index b924e2f76..c5ce8dd80 100755
--- a/scripts/build/lb_binary_hdd
+++ b/scripts/build/lb_binary_hdd
@@ -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 'build binary image')"
diff --git a/scripts/build/lb_binary_hooks b/scripts/build/lb_binary_hooks
index 8018f79a3..07cf4577c 100755
--- a/scripts/build/lb_binary_hooks
+++ b/scripts/build/lb_binary_hooks
@@ -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 'execute hooks in binary')"
diff --git a/scripts/build/lb_binary_includes b/scripts/build/lb_binary_includes
index c7273958a..43fd5d07a 100755
--- a/scripts/build/lb_binary_includes
+++ b/scripts/build/lb_binary_includes
@@ -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 'copy files into binary')"
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index d46665664..cfd7eb2a5 100755
--- a/scripts/build/lb_binary_iso
+++ b/scripts/build/lb_binary_iso
@@ -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 'build iso binary image')"
diff --git a/scripts/build/lb_binary_linux-image b/scripts/build/lb_binary_linux-image
index e36b54b3e..9c530a795 100755
--- a/scripts/build/lb_binary_linux-image
+++ b/scripts/build/lb_binary_linux-image
@@ -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 'install linux-image into binary')"
diff --git a/scripts/build/lb_binary_manifest b/scripts/build/lb_binary_manifest
index 383aa07ab..e0f17ed9a 100755
--- a/scripts/build/lb_binary_manifest
+++ b/scripts/build/lb_binary_manifest
@@ -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 'create manifest')"
diff --git a/scripts/build/lb_binary_memtest b/scripts/build/lb_binary_memtest
index 8b8700ae3..1c0683189 100755
--- a/scripts/build/lb_binary_memtest
+++ b/scripts/build/lb_binary_memtest
@@ -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 'installs a memtest into binary')"
diff --git a/scripts/build/lb_binary_netboot b/scripts/build/lb_binary_netboot
index 0b01121fb..9875d0e5c 100755
--- a/scripts/build/lb_binary_netboot
+++ b/scripts/build/lb_binary_netboot
@@ -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 'build netboot binary image')"
diff --git a/scripts/build/lb_binary_package-lists b/scripts/build/lb_binary_package-lists
index b3414ef26..c77b15064 100755
--- a/scripts/build/lb_binary_package-lists
+++ b/scripts/build/lb_binary_package-lists
@@ -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 'install local packages into binary')"
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 860b6002d..25230ccfe 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -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 'build rootfs image')"
diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo
index 835a64e05..f2f0c62be 100755
--- a/scripts/build/lb_binary_silo
+++ b/scripts/build/lb_binary_silo
@@ -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 'installs silo into binary')"
diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 300841ad8..548cafd98 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -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 'installs syslinux into binary')"
diff --git a/scripts/build/lb_binary_tar b/scripts/build/lb_binary_tar
index d560b7636..83fdc25ee 100755
--- a/scripts/build/lb_binary_tar
+++ b/scripts/build/lb_binary_tar
@@ -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 'build harddisk binary image')"
diff --git a/scripts/build/lb_binary_virtual-hdd b/scripts/build/lb_binary_virtual-hdd
index f34b3a4a2..b58c80355 100755
--- a/scripts/build/lb_binary_virtual-hdd
+++ b/scripts/build/lb_binary_virtual-hdd
@@ -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 'build binary image')"
diff --git a/scripts/build/lb_binary_win32-loader b/scripts/build/lb_binary_win32-loader
index b0ecf99a9..1eaed9fee 100755
--- a/scripts/build/lb_binary_win32-loader
+++ b/scripts/build/lb_binary_win32-loader
@@ -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 'copy win32-loader into binary')"
diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot
index c99cbfc94..271528406 100755
--- a/scripts/build/lb_binary_yaboot
+++ b/scripts/build/lb_binary_yaboot
@@ -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 'installs yaboot into binary')"
diff --git a/scripts/build/lb_binary_zsync b/scripts/build/lb_binary_zsync
index f599bfcfb..271e70969 100755
--- a/scripts/build/lb_binary_zsync
+++ b/scripts/build/lb_binary_zsync
@@ -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 'build zsync control files')"
diff --git a/scripts/build/lb_bootstrap b/scripts/build/lb_bootstrap
index a6d30aef7..319927ca2 100755
--- a/scripts/build/lb_bootstrap
+++ b/scripts/build/lb_bootstrap
@@ -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
 
 # Automatically populating config tree
 if [ -x auto/config ] && [ ! -e .build/config ]
diff --git a/scripts/build/lb_bootstrap_cache b/scripts/build/lb_bootstrap_cache
index ef71436f0..51c9363db 100755
--- a/scripts/build/lb_bootstrap_cache
+++ b/scripts/build/lb_bootstrap_cache
@@ -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 'cache bootstrap stage')"
diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap
index c694f0358..bb4eb6dff 100755
--- a/scripts/build/lb_bootstrap_cdebootstrap
+++ b/scripts/build/lb_bootstrap_cdebootstrap
@@ -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 'bootstrap a Debian system with cdebootstrap(1)')"
diff --git a/scripts/build/lb_bootstrap_copy b/scripts/build/lb_bootstrap_copy
index c743142bf..ce1abd00a 100755
--- a/scripts/build/lb_bootstrap_copy
+++ b/scripts/build/lb_bootstrap_copy
@@ -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 'bootstrap by copying the host system')"
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index d5865b6bb..1cb371f0f 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -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 'bootstrap a Debian system with debootstrap(8)')"
diff --git a/scripts/build/lb_build b/scripts/build/lb_build
index 7579111de..d589cf7fc 100755
--- a/scripts/build/lb_build
+++ b/scripts/build/lb_build
@@ -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
 
 # Automatically populating config tree
 if [ -x auto/config ] && [ ! -e .build/config ]
diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index ada67c3fb..e6353a77d 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -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
 
 # Automatically populating config tree
 if [ -x auto/config ] && [ ! -e .build/config ]
diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt
index a800c6302..0c07d4f99 100755
--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/lb_chroot_apt
@@ -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 'manage /etc/apt/apt.conf')"
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 304480b28..3281a0cf3 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -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 'manage /etc/apt/sources.list')"
diff --git a/scripts/build/lb_chroot_cache b/scripts/build/lb_chroot_cache
index 2464a0fbd..785c2f90c 100755
--- a/scripts/build/lb_chroot_cache
+++ b/scripts/build/lb_chroot_cache
@@ -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 'cache chroot stage')"
diff --git a/scripts/build/lb_chroot_debianchroot b/scripts/build/lb_chroot_debianchroot
index 1db11421a..285e858f1 100755
--- a/scripts/build/lb_chroot_debianchroot
+++ b/scripts/build/lb_chroot_debianchroot
@@ -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 'manage /etc/debian_chroot')"
diff --git a/scripts/build/lb_chroot_devpts b/scripts/build/lb_chroot_devpts
index 6cde4f437..2e7365d66 100755
--- a/scripts/build/lb_chroot_devpts
+++ b/scripts/build/lb_chroot_devpts
@@ -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 'mount /dev/pts')"
diff --git a/scripts/build/lb_chroot_dpkg b/scripts/build/lb_chroot_dpkg
index e2f76ade4..d4f0631f0 100755
--- a/scripts/build/lb_chroot_dpkg
+++ b/scripts/build/lb_chroot_dpkg
@@ -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 'manage /sbin/dpkg')"
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index 06bfe50a1..7c863d958 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -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 'execute hacks in chroot')"
diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks
index 368e922ef..0ccfe2b32 100755
--- a/scripts/build/lb_chroot_hooks
+++ b/scripts/build/lb_chroot_hooks
@@ -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 'execute hooks in chroot')"
diff --git a/scripts/build/lb_chroot_hostname b/scripts/build/lb_chroot_hostname
index 28cb50163..f6aa323bc 100755
--- a/scripts/build/lb_chroot_hostname
+++ b/scripts/build/lb_chroot_hostname
@@ -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 'manage /bin/hostname')"
diff --git a/scripts/build/lb_chroot_hosts b/scripts/build/lb_chroot_hosts
index d8d8abbb1..d17243b95 100755
--- a/scripts/build/lb_chroot_hosts
+++ b/scripts/build/lb_chroot_hosts
@@ -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 'manage /etc/hosts')"
diff --git a/scripts/build/lb_chroot_includes b/scripts/build/lb_chroot_includes
index ba31d5c29..7d0d77dbb 100755
--- a/scripts/build/lb_chroot_includes
+++ b/scripts/build/lb_chroot_includes
@@ -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 'copy files into chroot')"
diff --git a/scripts/build/lb_chroot_install-packages b/scripts/build/lb_chroot_install-packages
index d0ad72476..a16164e3f 100755
--- a/scripts/build/lb_chroot_install-packages
+++ b/scripts/build/lb_chroot_install-packages
@@ -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 'install queued packages into chroot')"
diff --git a/scripts/build/lb_chroot_interactive b/scripts/build/lb_chroot_interactive
index 58e69e7e3..55c1bd994 100755
--- a/scripts/build/lb_chroot_interactive
+++ b/scripts/build/lb_chroot_interactive
@@ -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 'make build interactive')"
diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image
index e2ca8305b..6a180d266 100755
--- a/scripts/build/lb_chroot_linux-image
+++ b/scripts/build/lb_chroot_linux-image
@@ -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 'schedule kernel packages for installation')"
diff --git a/scripts/build/lb_chroot_live-packages b/scripts/build/lb_chroot_live-packages
index 0e4ff44c0..98b75efde 100755
--- a/scripts/build/lb_chroot_live-packages
+++ b/scripts/build/lb_chroot_live-packages
@@ -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 'schedule live packages for installation')"
diff --git a/scripts/build/lb_chroot_package-lists b/scripts/build/lb_chroot_package-lists
index e2dabb151..d99624d37 100755
--- a/scripts/build/lb_chroot_package-lists
+++ b/scripts/build/lb_chroot_package-lists
@@ -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 'queue install of package lists into chroot')"
diff --git a/scripts/build/lb_chroot_preseed b/scripts/build/lb_chroot_preseed
index 3aa83b334..6ce34d3a5 100755
--- a/scripts/build/lb_chroot_preseed
+++ b/scripts/build/lb_chroot_preseed
@@ -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 'execute local preseed in chroot')"
diff --git a/scripts/build/lb_chroot_proc b/scripts/build/lb_chroot_proc
index 4ceb0885a..99785253f 100755
--- a/scripts/build/lb_chroot_proc
+++ b/scripts/build/lb_chroot_proc
@@ -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 'mount /proc')"
diff --git a/scripts/build/lb_chroot_resolv b/scripts/build/lb_chroot_resolv
index 417c412d1..601848917 100755
--- a/scripts/build/lb_chroot_resolv
+++ b/scripts/build/lb_chroot_resolv
@@ -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 'manage /etc/resolv.conf')"
diff --git a/scripts/build/lb_chroot_selinuxfs b/scripts/build/lb_chroot_selinuxfs
index e3a69fcbd..76aa3c9b1 100755
--- a/scripts/build/lb_chroot_selinuxfs
+++ b/scripts/build/lb_chroot_selinuxfs
@@ -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 'mount /selinux')"
diff --git a/scripts/build/lb_chroot_sysfs b/scripts/build/lb_chroot_sysfs
index 048f1aab0..2c532710e 100755
--- a/scripts/build/lb_chroot_sysfs
+++ b/scripts/build/lb_chroot_sysfs
@@ -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 'mount /sys')"
diff --git a/scripts/build/lb_chroot_sysv-rc b/scripts/build/lb_chroot_sysv-rc
index 94db1caf4..572f4eb3b 100755
--- a/scripts/build/lb_chroot_sysv-rc
+++ b/scripts/build/lb_chroot_sysv-rc
@@ -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 'manage /usr/sbin/policy-rc.d')"
diff --git a/scripts/build/lb_chroot_tmpfs b/scripts/build/lb_chroot_tmpfs
index bf0c977a9..db3a4e0da 100755
--- a/scripts/build/lb_chroot_tmpfs
+++ b/scripts/build/lb_chroot_tmpfs
@@ -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 'use tmpfs to speedup the build')"
diff --git a/scripts/build/lb_chroot_upstart b/scripts/build/lb_chroot_upstart
index ea22549fe..2e43636c9 100755
--- a/scripts/build/lb_chroot_upstart
+++ b/scripts/build/lb_chroot_upstart
@@ -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 'manage /sbin/initctl')"
diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean
index 4b7c23b41..83dafb1d6 100755
--- a/scripts/build/lb_clean
+++ b/scripts/build/lb_clean
@@ -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
 
 # Read meta config
 if [ "${1}" != "noauto" ] && [ -x auto/clean ]
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 8dbd0b884..cd57d4f24 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -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
 PROGRAM="lb config"
diff --git a/scripts/build/lb_source b/scripts/build/lb_source
index 7e1c95276..ad9e262bf 100755
--- a/scripts/build/lb_source
+++ b/scripts/build/lb_source
@@ -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
 
 # Automatically populating config tree
 if [ -x auto/config ] && [ ! -e .build/config ]
diff --git a/scripts/build/lb_source_checksums b/scripts/build/lb_source_checksums
index 4dab56adc..681cc102c 100755
--- a/scripts/build/lb_source_checksums
+++ b/scripts/build/lb_source_checksums
@@ -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 'create source checksums')"
diff --git a/scripts/build/lb_source_debian b/scripts/build/lb_source_debian
index d7fa4af76..31c8549c5 100755
--- a/scripts/build/lb_source_debian
+++ b/scripts/build/lb_source_debian
@@ -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 'debian sources')"
diff --git a/scripts/build/lb_source_debian-live b/scripts/build/lb_source_debian-live
index c9c8d405e..9e647c362 100755
--- a/scripts/build/lb_source_debian-live
+++ b/scripts/build/lb_source_debian-live
@@ -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 'copy debian-live config into source')"
diff --git a/scripts/build/lb_source_disk b/scripts/build/lb_source_disk
index e1216ccc0..67d79a159 100755
--- a/scripts/build/lb_source_disk
+++ b/scripts/build/lb_source_disk
@@ -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 'install disk information into source')"
diff --git a/scripts/build/lb_source_hdd b/scripts/build/lb_source_hdd
index 9d597dee1..268860d52 100755
--- a/scripts/build/lb_source_hdd
+++ b/scripts/build/lb_source_hdd
@@ -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 'build source image')"
diff --git a/scripts/build/lb_source_iso b/scripts/build/lb_source_iso
index 6b3807f3f..bfe63b410 100755
--- a/scripts/build/lb_source_iso
+++ b/scripts/build/lb_source_iso
@@ -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 'build iso source image')"
diff --git a/scripts/build/lb_source_tar b/scripts/build/lb_source_tar
index ae82a2ec4..2033a0e50 100755
--- a/scripts/build/lb_source_tar
+++ b/scripts/build/lb_source_tar
@@ -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 'build source tarball')"
diff --git a/scripts/build/lb_source_virtual-hdd b/scripts/build/lb_source_virtual-hdd
index de4665ade..2f019dba6 100755
--- a/scripts/build/lb_source_virtual-hdd
+++ b/scripts/build/lb_source_virtual-hdd
@@ -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 'build source image')"
diff --git a/scripts/build/lb_testroot b/scripts/build/lb_testroot
index cec89dfb5..d299074a8 100755
--- a/scripts/build/lb_testroot
+++ b/scripts/build/lb_testroot
@@ -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 'ensure that a system is built as root')"