buildd: use $FLAVOURS to control which flavours are built

diff --git a/buildd/cronjob.sh b/buildd/cronjob.sh
index 540293a..31a892e 100755 (executable)
--- a/buildd/cronjob.sh
+++ b/buildd/cronjob.sh
@@ -15,6 +15,15 @@
 # 03 03 * * * /home/mika/cronjobs/cleanup.sh
 ################################################################################
 
+die() {
+  [ -n "$1" ] && echo "$1">&2
+  exit 1
+}
+
+. /etc/grml/grml-buildd.conf || die "Could not source /etc/grml/grml-buildd.conf. Exiting."
+
+[ -n "$FLAVOURS" ] || die "\$FLAVOURS is not set. Exiting."
+
 if [ -r /usr/share/grml-live/buildd/buildd_running ] ; then
   echo "already running instance of grml-live buildd found, exiting.">&2
   echo "if you think this is not true: rm /usr/share/grml-live/buildd/buildd_running">&2
@@ -23,29 +32,11 @@ fi
 
 echo $$ > /usr/share/grml-live/buildd/buildd_running
 
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-small_wheezy.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-small_sid.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-small_wheezy.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-small_sid.sh
-
-/usr/share/grml-live/buildd/upload_isos.sh && \
-/usr/share/grml-live/buildd/remove_isos.sh
-
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-medium_wheezy.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-medium_sid.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-medium_wheezy.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-medium_sid.sh
-
-/usr/share/grml-live/buildd/upload_isos.sh && \
-/usr/share/grml-live/buildd/remove_isos.sh
-
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-full_wheezy.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-full_sid.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-full_wheezy.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-full_sid.sh
-
-/usr/share/grml-live/buildd/upload_isos.sh && \
-/usr/share/grml-live/buildd/remove_isos.sh
+for flavour in $FLAVOURS; do
+  /usr/share/grml-live/buildd/grml-live_autobuild_${flavour}.sh
+  /usr/share/grml-live/buildd/upload_isos.sh && \
+  /usr/share/grml-live/buildd/remove_isos.sh
+done
 
 rm -f /usr/share/grml-live/buildd/buildd_running
 

diff --git a/buildd/grml-live_autobuild_grml64-full_sid.sh b/buildd/grml-live_autobuild_grml64_sid.sh
similarity index 100%
rename from buildd/grml-live_autobuild_grml64-full_sid.sh
rename to buildd/grml-live_autobuild_grml64_sid.sh

diff --git a/buildd/grml-live_autobuild_grml64-full_squeeze.sh b/buildd/grml-live_autobuild_grml64_squeeze.sh
similarity index 100%
rename from buildd/grml-live_autobuild_grml64-full_squeeze.sh
rename to buildd/grml-live_autobuild_grml64_squeeze.sh

diff --git a/buildd/grml-live_autobuild_grml64-full_wheezy.sh b/buildd/grml-live_autobuild_grml64_wheezy.sh
similarity index 100%
rename from buildd/grml-live_autobuild_grml64-full_wheezy.sh
rename to buildd/grml-live_autobuild_grml64_wheezy.sh

diff --git a/buildd/grml-live_autobuild_grml-full_sid.sh b/buildd/grml-live_autobuild_grml_sid.sh
similarity index 100%
rename from buildd/grml-live_autobuild_grml-full_sid.sh
rename to buildd/grml-live_autobuild_grml_sid.sh

diff --git a/buildd/grml-live_autobuild_grml-full_squeeze.sh b/buildd/grml-live_autobuild_grml_squeeze.sh
similarity index 100%
rename from buildd/grml-live_autobuild_grml-full_squeeze.sh
rename to buildd/grml-live_autobuild_grml_squeeze.sh

diff --git a/buildd/grml-live_autobuild_grml-full_wheezy.sh b/buildd/grml-live_autobuild_grml_wheezy.sh
similarity index 100%
rename from buildd/grml-live_autobuild_grml-full_wheezy.sh
rename to buildd/grml-live_autobuild_grml_wheezy.sh