From 68de5fc897d16f182ae536c9ca4a232b6489d14e Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Tue, 17 Nov 2015 18:58:58 +0100
Subject: [PATCH] deployiso: set source_dir properly for buildsets

---
 bin/deployiso.in    | 22 ++++++++++++++--------
 lib/util-publish.sh |  8 ++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/bin/deployiso.in b/bin/deployiso.in
index 92a67d9..3b269b0 100644
--- a/bin/deployiso.in
+++ b/bin/deployiso.in
@@ -23,10 +23,16 @@ show_upload_queue(){
 	if ${is_buildset};then
 		local list=$(cat ${sets_dir_iso}/${buildset_iso}.set)
 		for item in ${list[@]}; do
-			msg2 "$item"
+			msg3 "Iso: $item"
+			eval_edition "$item"
+			set_src_dir $item
+			msg2 "src_dir: ${src_dir}"
 		done
 	else
-            msg2 "${buildset_iso}"
+            msg3 "Iso: ${buildset_iso}"
+            eval_edition "${buildset_iso}"
+            set_src_dir ${buildset_iso}
+            msg2 "src_dir: ${src_dir}"
 	fi
 }
 
@@ -40,12 +46,12 @@ display_settings(){
 	msg2 "buildset_iso: ${buildset_iso}"
 	msg2 "is_buildset: ${is_buildset}"
 
-	msg "OPTIONS:"
-	msg2 "buildset_iso: ${buildset_iso}"
+# 	msg "OPTIONS:"
+# 	msg2 "buildset_iso: ${buildset_iso}"
 
 	msg "HOST:"
 	msg2 "dist_release: ${dist_release}"
-	msg2 "src_dir: ${src_dir}"
+# 	msg2 "src_dir: ${src_dir}"
 
 	msg "REMOTE:"
 	msg2 "remote_url: ${remote_url}"
@@ -64,7 +70,7 @@ load_config "${SYSCONFDIR}/manjaro-tools.conf"
 
 pretend=false
 
-src_dir=${cache_dir}/iso
+#src_dir=${cache_dir}/iso
 
 usage() {
 	echo "Usage: ${0##*/} [options]"
@@ -97,12 +103,12 @@ fi
 
 eval_buildset "${buildset_iso}" "${sets_dir_iso}"
 
-eval_edition "${buildset_iso}"
+# eval_edition "${buildset_iso}"
 
 sf_url=${remote_user},${remote_project}@frs.${remote_url}:${remote_target}/${remote_project}
 #shell_url=${remote_user},${remote_project}@shell.${remote_url}
 
-src_dir=${src_dir}/${iso_edition}/${dist_release}/${buildset_iso}
+# src_dir=${src_dir}/${iso_edition}/${dist_release}/${buildset_iso}
 
 ${pretend} && display_settings && exit 1
 
diff --git a/lib/util-publish.sh b/lib/util-publish.sh
index 120e575..c9b83bb 100644
--- a/lib/util-publish.sh
+++ b/lib/util-publish.sh
@@ -26,12 +26,20 @@ sync_dir(){
 	msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer_start}) minutes"
 }
 
+set_src_dir(){
+        src_dir=${cache_dir}/iso/${iso_edition}/${dist_release}/$1
+}
+
 upload(){
 	if ${is_buildset};then
 		for prof in $(cat ${sets_dir_iso}/$1.set); do
+                        eval_edition "$prof"
+                        set_src_dir "$prof"
 			sync_dir "$prof"
 		done
 	else
+                eval_edition "$1"
+                set_src_dir "$1"
 		sync_dir "$1"
 	fi
 }