X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=buildd%2Fcronjob.sh;h=31a892eb725aa080f52d60701e29751c85f85612;hp=c69291b632ccac418dabf44b00f7882981cd154c;hb=b63a5f16ac3f03eb93220fd26ab188e50314f5d0;hpb=7a4841173a5464df4fa06afa3ed0c669268c69b6

diff --git a/buildd/cronjob.sh b/buildd/cronjob.sh
index c69291b..31a892e 100755
--- a/buildd/cronjob.sh
+++ b/buildd/cronjob.sh
@@ -7,14 +7,23 @@
 ################################################################################
 # Add something like that to the crontab to execute grml-live buildd
 # every day at a specific time:
-# 30 1 * * * /usr/share/grml-live/buildd/cronjob.sh
-# 
+# 50 0 * * * /usr/share/grml-live/buildd/cronjob.sh
+#
 # On the mirror (where you're hosting the ISOs) you might want to
 # install something like that in your crontab:
-# 02  * * * * /srv/mirror/www.grml.org/daily/.link_latest.sh
-# 03 03 * * * /srv/mirror/www.grml.org/daily/.cleanup.sh
+# 02  * * * * /home/mika/cronjobs/link_latest.sh
+# 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_lenny.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-small_squeeze.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-small_sid.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-small_lenny.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-small_squeeze.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-small_sid.sh
-
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-medium_lenny.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-medium_squeeze.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-medium_sid.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-medium_lenny.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-medium_squeeze.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-medium_sid.sh
-
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-large_lenny.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-large_squeeze.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml64-large_sid.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-large_lenny.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-large_squeeze.sh && \
-/usr/share/grml-live/buildd/grml-live_autobuild_grml-large_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