From 032c0dc5531d0493e539b45055ac0fb22c1b5415 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sat, 28 May 2011 12:18:53 +0200
Subject: [PATCH] [scripts] strictly follow spec files order given in arrays

---
 scripts/daily_iso_build.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/daily_iso_build.sh b/scripts/daily_iso_build.sh
index 0b155b1..c392d9e 100755
--- a/scripts/daily_iso_build.sh
+++ b/scripts/daily_iso_build.sh
@@ -106,6 +106,7 @@ build_sabayon() {
 		rm -rf /sabayon/molecules/daily/*.spec
 		rm -rf /sabayon/molecules/daily/remaster/*.spec
 
+		local source_specs=""
 		for i in ${!SOURCE_SPECS[@]}
 		do
 			src="/sabayon/molecules/${SOURCE_SPECS[i]}"
@@ -119,8 +120,10 @@ build_sabayon() {
 			# tweak release version
 			sed -i "s/release_version.*/release_version: ${CUR_DATE}/" "${dst}" || exit 1
 			echo "${dst}: iso: ${SOURCE_SPECS_ISO[i]} date: ${CUR_DATE}"
+			source_specs+="\"${dst}\" "
 		done
 
+		local remaster_specs=""
 		for i in ${!REMASTER_SPECS[@]}
 		do
 			src="/sabayon/molecules/${REMASTER_SPECS[i]}"
@@ -132,6 +135,7 @@ build_sabayon() {
 			# tweak release version
 			sed -i "s/release_version.*/release_version: ${CUR_DATE}/" "${dst}" || exit 1
 			echo "${dst}: iso: ${REMASTER_SPECS_ISO[i]} date: ${CUR_DATE}"
+			remaster_specs+="\"${dst}\" "
 		done
 
 		for i in ${!REMASTER_OPENVZ_SPECS[@]}
@@ -145,10 +149,11 @@ build_sabayon() {
 			# tweak release version
 			sed -i "s/release_version.*/release_version: ${CUR_DATE}/" "${dst}" || exit 1
 			echo "${dst}: iso: ${REMASTER_OPENVZ_SPECS_TAR[i]} date: ${CUR_DATE}"
+			remaster_specs+="\"${dst}\" "
 		done
 
-		molecule --nocolor /sabayon/molecules/daily/*.spec && \
-			molecule --nocolor /sabayon/molecules/daily/remaster/*.spec && \
+		molecule --nocolor ${source_specs} && \
+			molecule --nocolor ${remaster_specs} && \
 			cp /sabayon/iso/*DAILY* /sabayon/iso_rsync/ && \
 			( date > /sabayon/iso_rsync/RELEASE_DATE_DAILY ) && \
 			/sabayon/scripts/make_torrents.sh