diff options
69 files changed, 69 insertions, 69 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 diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary index e0e3e47d3..4fbbc096d 100755 --- a/scripts/build/lb_binary +++ b/scripts/build/lb_binary @@ -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 # 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 baa0b4633..e6ece1457 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 || . /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 'create binary checksums')" diff --git a/scripts/build/lb_binary_chroot b/scripts/build/lb_binary_chroot index 0b7fa067f..4d4500e55 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 || . /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 'copy chroot into chroot')" diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index b3c3fd9ae..a6ed88b6e 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 || . /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 'install debian-installer into binary')" diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk index e42a4becc..e8e5c0ddc 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 || . /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 'install disk information into binary')" diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub index 4633b5fd8..1dd1201e7 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 || . /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 'installs grub into binary')" diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2 index 1f783f10a..738f28006 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 || . /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 'installs grub2 into binary')" diff --git a/scripts/build/lb_binary_hdd b/scripts/build/lb_binary_hdd index c5ce8dd80..4dd515fee 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 || . /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 'build binary image')" diff --git a/scripts/build/lb_binary_hooks b/scripts/build/lb_binary_hooks index 97faa3077..cd1270be5 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 || . /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 'execute hooks in binary')" diff --git a/scripts/build/lb_binary_includes b/scripts/build/lb_binary_includes index 43fd5d07a..f1f345a95 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 || . /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 'copy files into binary')" diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso index cfd7eb2a5..c25674bbb 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 || . /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 'build iso binary image')" diff --git a/scripts/build/lb_binary_linux-image b/scripts/build/lb_binary_linux-image index 9c530a795..94afac8f9 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 || . /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 'install linux-image into binary')" diff --git a/scripts/build/lb_binary_manifest b/scripts/build/lb_binary_manifest index e0f17ed9a..b62a43754 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 || . /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 'create manifest')" diff --git a/scripts/build/lb_binary_memtest b/scripts/build/lb_binary_memtest index 1c0683189..d96c778d2 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 || . /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 'installs a memtest into binary')" diff --git a/scripts/build/lb_binary_netboot b/scripts/build/lb_binary_netboot index 9875d0e5c..08cc9d308 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 || . /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 'build netboot binary image')" diff --git a/scripts/build/lb_binary_package-lists b/scripts/build/lb_binary_package-lists index c77b15064..86716785d 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 || . /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 'install local packages into binary')" diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs index 68fae4091..6704b524a 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 || . /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 'build rootfs image')" diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo index f2f0c62be..b1ec175e4 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 || . /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 'installs silo into binary')" diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux index 41b141db2..cf9c4a2c6 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 || . /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 'installs syslinux into binary')" diff --git a/scripts/build/lb_binary_tar b/scripts/build/lb_binary_tar index 83fdc25ee..9b9b3dec0 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 || . /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 'build harddisk binary image')" diff --git a/scripts/build/lb_binary_virtual-hdd b/scripts/build/lb_binary_virtual-hdd index b58c80355..f8121e625 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 || . /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 'build binary image')" diff --git a/scripts/build/lb_binary_win32-loader b/scripts/build/lb_binary_win32-loader index 1eaed9fee..7fd5ff2a4 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 || . /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 'copy win32-loader into binary')" diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot index 271528406..4838cf351 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 || . /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 'installs yaboot into binary')" diff --git a/scripts/build/lb_binary_zsync b/scripts/build/lb_binary_zsync index 271e70969..7fdaf596a 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 || . /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 'build zsync control files')" diff --git a/scripts/build/lb_bootstrap b/scripts/build/lb_bootstrap index 2b84b993a..ed9c77498 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 || . /usr/lib/live/build.sh +[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /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 51c9363db..6b0f582ea 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 || . /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 'cache bootstrap stage')" diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap index 931c837f0..3c8843e2b 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 || . /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 'bootstrap a Debian system with cdebootstrap(1)')" diff --git a/scripts/build/lb_bootstrap_copy b/scripts/build/lb_bootstrap_copy index ce1abd00a..1028342c6 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 || . /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 'bootstrap by copying the host system')" diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap index d9a4e8212..b0fa09fa1 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 || . /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 'bootstrap a Debian system with debootstrap(8)')" diff --git a/scripts/build/lb_build b/scripts/build/lb_build index bdec9b2f5..d7b989dec 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 || . /usr/lib/live/build.sh +[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /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 944155b5b..1c6348293 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 || . /usr/lib/live/build.sh +[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /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 0c07d4f99..2e1bce289 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 || . /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 'manage /etc/apt/apt.conf')" diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives index 1d0bee92c..d0033d29e 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 || . /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 'manage /etc/apt/sources.list')" diff --git a/scripts/build/lb_chroot_cache b/scripts/build/lb_chroot_cache index 785c2f90c..4c4b055bf 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 || . /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 'cache chroot stage')" diff --git a/scripts/build/lb_chroot_debianchroot b/scripts/build/lb_chroot_debianchroot index 285e858f1..7e07b3655 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 || . /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 'manage /etc/debian_chroot')" diff --git a/scripts/build/lb_chroot_devpts b/scripts/build/lb_chroot_devpts index 2e7365d66..428927f06 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 || . /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 'mount /dev/pts')" diff --git a/scripts/build/lb_chroot_dpkg b/scripts/build/lb_chroot_dpkg index d4f0631f0..9698f7923 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 || . /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 'manage /sbin/dpkg')" diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks index 7c863d958..f0e885b08 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 || . /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 'execute hacks in chroot')" diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks index e8a03d0f6..b81e3cb24 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 || . /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 'execute hooks in chroot')" diff --git a/scripts/build/lb_chroot_hostname b/scripts/build/lb_chroot_hostname index f6aa323bc..9f56901e4 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 || . /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 'manage /bin/hostname')" diff --git a/scripts/build/lb_chroot_hosts b/scripts/build/lb_chroot_hosts index d17243b95..3adaebfe4 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 || . /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 'manage /etc/hosts')" diff --git a/scripts/build/lb_chroot_includes b/scripts/build/lb_chroot_includes index 7d0d77dbb..8d3c75eee 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 || . /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 'copy files into chroot')" diff --git a/scripts/build/lb_chroot_install-packages b/scripts/build/lb_chroot_install-packages index a16164e3f..d7d916496 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 || . /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 'install queued packages into chroot')" diff --git a/scripts/build/lb_chroot_interactive b/scripts/build/lb_chroot_interactive index 55c1bd994..31a34fc8a 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 || . /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 'make build interactive')" diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image index 6a180d266..bb672c1d2 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 || . /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 'schedule kernel packages for installation')" diff --git a/scripts/build/lb_chroot_live-packages b/scripts/build/lb_chroot_live-packages index 98b75efde..057e423f6 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 || . /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 'schedule live packages for installation')" diff --git a/scripts/build/lb_chroot_package-lists b/scripts/build/lb_chroot_package-lists index d99624d37..b85c00059 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 || . /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 'queue install of package lists into chroot')" diff --git a/scripts/build/lb_chroot_preseed b/scripts/build/lb_chroot_preseed index 6ce34d3a5..1a70340d8 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 || . /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 'execute local preseed in chroot')" diff --git a/scripts/build/lb_chroot_proc b/scripts/build/lb_chroot_proc index 99785253f..2c13fceb1 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 || . /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 'mount /proc')" diff --git a/scripts/build/lb_chroot_resolv b/scripts/build/lb_chroot_resolv index 601848917..b82e3667a 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 || . /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 'manage /etc/resolv.conf')" diff --git a/scripts/build/lb_chroot_selinuxfs b/scripts/build/lb_chroot_selinuxfs index 76aa3c9b1..20e30fb35 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 || . /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 'mount /selinux')" diff --git a/scripts/build/lb_chroot_sysfs b/scripts/build/lb_chroot_sysfs index 2c532710e..409728429 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 || . /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 'mount /sys')" diff --git a/scripts/build/lb_chroot_sysv-rc b/scripts/build/lb_chroot_sysv-rc index 572f4eb3b..4e1fc160e 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 || . /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 'manage /usr/sbin/policy-rc.d')" diff --git a/scripts/build/lb_chroot_tmpfs b/scripts/build/lb_chroot_tmpfs index db3a4e0da..80311f531 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 || . /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 'use tmpfs to speedup the build')" diff --git a/scripts/build/lb_chroot_upstart b/scripts/build/lb_chroot_upstart index 2e43636c9..fd7c72f75 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 || . /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 'manage /sbin/initctl')" diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean index 10450644d..4104e5256 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 || . /usr/lib/live/build.sh +[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /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 50416382b..2a1ae567b 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 || . /usr/lib/live/build.sh +[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh # Setting static variables PROGRAM="lb config" diff --git a/scripts/build/lb_source b/scripts/build/lb_source index a23681770..d52e8d41f 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 || . /usr/lib/live/build.sh +[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /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 681cc102c..cf9cce0dc 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 || . /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 'create source checksums')" diff --git a/scripts/build/lb_source_debian b/scripts/build/lb_source_debian index 31c8549c5..95a155d88 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 || . /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 'debian sources')" diff --git a/scripts/build/lb_source_debian-live b/scripts/build/lb_source_debian-live index 9e647c362..868d9d972 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 || . /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 'copy debian-live config into source')" diff --git a/scripts/build/lb_source_disk b/scripts/build/lb_source_disk index 67d79a159..e51b74df3 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 || . /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 'install disk information into source')" diff --git a/scripts/build/lb_source_hdd b/scripts/build/lb_source_hdd index 268860d52..0d764079c 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 || . /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 'build source image')" diff --git a/scripts/build/lb_source_iso b/scripts/build/lb_source_iso index bfe63b410..a9f0c281f 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 || . /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 'build iso source image')" diff --git a/scripts/build/lb_source_tar b/scripts/build/lb_source_tar index 2033a0e50..0ef302e44 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 || . /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 'build source tarball')" diff --git a/scripts/build/lb_source_virtual-hdd b/scripts/build/lb_source_virtual-hdd index 2f019dba6..d37fa9aa0 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 || . /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 'build source image')" diff --git a/scripts/build/lb_testroot b/scripts/build/lb_testroot index d299074a8..9ded104c9 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 || . /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 'ensure that a system is built as root')" |