From 19d695c05afcaffddd9a8629cfd8aeacd3fb8425 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 4 Dec 2012 12:47:40 +0100
Subject: Ensuring that functions are either sources locally or globally, but
 not both.

---
 scripts/build.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build.sh b/scripts/build.sh
index 21ff520d8..2e4a79ec8 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -6,11 +6,18 @@ then
 	export LIVE_BUILD
 fi
 
-# Source global functions
-for FUNCTION in "${LIVE_BUILD}"/functions/*.sh /usr/share/live/build/functions/*.sh
+for _DIRECTORY in "${LIVE_BUILD}/functions" /usr/share/live/build/functions
 do
-	if [ -e "${FUNCTION}" ]
+	if [ -e "${_DIRECTORY}" ]
 	then
-		. "${FUNCTION}"
+		for _FILE in "${_DIRECTORY}"/*.sh
+		do
+			if [ -e "${_FILE}" ]
+			then
+				. "${_FILE}"
+			fi
+		done
+
+		break
 	fi
 done
-- 
cgit v1.2.3