From 36c02b0081a7cede7cc441298b61c21bc05fcb63 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 30 Oct 2017 01:11:24 +0100
Subject: [PATCH] - change to the output path slightly to allow for easier
 uploading - allow specifying sites to build through environment variables

---
 .gitignore | 1 +
 build.sh   | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5502124..81b1ca8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 info
+sites
diff --git a/build.sh b/build.sh
index c291eb6..e3b29df 100755
--- a/build.sh
+++ b/build.sh
@@ -43,8 +43,9 @@ make
 export GLUON_RELEASE
 export GLUON_BRANCH
 # get the available sites...
-sites=""
-for s in sites/*; do sites="${sites} ${s##*/}"; done
+if [ "$sites" == "" ]; then
+	for s in sites/*; do sites="${sites} ${s##*/}"; done
+fi
 announce Gluon will be built for the following sites:$sites >&2
 announce The following targets will be generated: $targets >&2
 popd >/dev/null
@@ -53,7 +54,7 @@ pushd "${gluon_path}" >/dev/null
 announce Starting make update...
 for s in $sites; do
 	export GLUON_SITEDIR="${site_path}/sites/${s}"
-	export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_BRANCH}/${GLUON_RELEASE}/${s}"
+	export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}/${s}"
 	export GLUON_IMAGEDIR="${GLUON_OUTPUTDIR}/images"
 	export GLUON_MODULEDIR="${GLUON_OUTPUTDIR}/modules"
 	rm -rf "${GLUON_OUTPUTDIR}"