From d6e45a34376c9c80d1488ad4f3c9c1f85bedb338 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 27 Aug 2012 15:52:29 +0200
Subject: Making build.sh sourcing more robust (Closes: #684896).

---
 bin/lb         | 2 +-
 bin/live-build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/lb b/bin/lb
index e2d756688..1dd6a66cd 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 || . /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
-- 
cgit v1.2.3