From fc97e077d050c4039c1860a0fbea5d0f06b22224 Mon Sep 17 00:00:00 2001
From: Christian Hofstaedtler <ch@grml.org>
Date: Thu, 10 Nov 2011 12:18:13 +0100
Subject: [PATCH] buildd: configure $FLAVOURS

Note that cronjob.sh doesn't use this for now, but everything else
does.
---
 buildd/cleanup.sh       |  9 ++++++---
 buildd/grml-buildd.conf |  9 +++++++++
 buildd/link_latest.sh   |  9 ++++++---
 buildd/upload_isos.sh   | 12 +++++-------
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/buildd/cleanup.sh b/buildd/cleanup.sh
index d351525..6c25a68 100755
--- a/buildd/cleanup.sh
+++ b/buildd/cleanup.sh
@@ -28,6 +28,11 @@ if [ -z "$STORAGE_ADMIN" ] ; then
   exit 2
 fi
 
+if [ -z "$FLAVOURS" ] ; then
+  echo "Error: \$FLAVOURS is not set. Exiting." >&2
+  exit 2
+fi
+
 if ! cd "$MIRROR_DIRECTORY" ; then
   echo "Error: could not change directory to $MIRROR_DIRECTORY" >&2
   exit 3
@@ -39,9 +44,7 @@ fi
 DAYS=3
 
 REMOVE_ME=""
-for flavour in grml-medium_wheezy   grml-medium_sid   grml-small_wheezy   grml-small_sid \
-               grml64-medium_wheezy grml64-medium_sid grml64-small_wheezy grml64-small_sid \
-               grml64_wheezy        grml64_sid        grml_wheezy         grml_sid ; do
+for flavour in $FLAVOURS; do
   FILE_COUNT=$(ls -1 $flavour/$flavour*.iso | wc -l)
   if [ "$FILE_COUNT" -gt "$DAYS" ] ; then
      FILES=$(ls -1 $flavour/$flavour*.iso | tail -"$DAYS")
diff --git a/buildd/grml-buildd.conf b/buildd/grml-buildd.conf
index 4ba67c6..63c082d 100644
--- a/buildd/grml-buildd.conf
+++ b/buildd/grml-buildd.conf
@@ -37,6 +37,15 @@
 # used for example inside /usr/share/grml-live/buildd/cleanup.sh
 #MIRROR_DIRECTORY=/srv/mirror/www.grml.org/daily
 
+# which flavours are built
+#FLAVOURS=" \
+#         grml-small_wheezy    grml-small_sid    \
+#         grml-medium_wheezy   grml-medium_sid   \
+#         grml_wheezy          grml_sid          \
+#         grml64-small_wheezy  grml64-small_sid  \
+#         grml64-medium_wheezy grml64-medium_sid \
+#         grml64_wheezy        grml64_sid        \
+#         "
 
 
 ## END OF FILE #################################################################
diff --git a/buildd/link_latest.sh b/buildd/link_latest.sh
index 7f377c3..92a2ea5 100755
--- a/buildd/link_latest.sh
+++ b/buildd/link_latest.sh
@@ -22,15 +22,18 @@ if [ -z "$MIRROR_DIRECTORY" ] ; then
   exit 1
 fi
 
+if [ -z "$FLAVOURS" ] ; then
+  echo "Error: \$FLAVOURS is not set. Exiting." >&2
+  exit 2
+fi
+
 if ! cd "$MIRROR_DIRECTORY" ; then
   echo "Error: could not change directory to $MIRROR_DIRECTORY" >&2
   exit 1
 fi
 
 echo "---------------------------" >> "$MIRROR_DIRECTORY"/.timestamp_link
-for flavour in grml-medium_wheezy   grml-medium_sid   grml-small_wheezy   grml-small_sid \
-               grml64-medium_wheezy grml64-medium_sid grml64-small_wheezy grml64-small_sid \
-               grml64_wheezy        grml64_sid        grml_wheezy         grml_sid ; do
+for flavour in $FLAVOURS; do
   ISO="$(ls -1 $flavour/*.iso | tail -1)"
   if [ -n "$ISO" ] ; then
      latest="$(basename ${ISO%%_[0-9]*})_latest.iso"
diff --git a/buildd/upload_isos.sh b/buildd/upload_isos.sh
index 29960ae..a18d3e3 100755
--- a/buildd/upload_isos.sh
+++ b/buildd/upload_isos.sh
@@ -9,6 +9,7 @@
 . /etc/grml/grml-buildd.conf || exit 1
 [ -n "$RSYNC_MIRROR" ] || exit 2
 [ -n "$ISO_DIR" ] || exit 3
+[ -n "$FLAVOURS" ] || exit 5
 
 cd $ISO_DIR || exit 4
 
@@ -19,13 +20,10 @@ for file in *.iso ; do
     chmod 664 "${file}" "${file}".md5 "${file}".sha1
 done
 
-for distri in squeeze wheezy sid ; do
-  for flavour in grml-small_$distri   grml-medium_$distri   grml_$distri \
-                 grml64-small_$distri grml64-medium_$distri grml64_$distri ; do
-                 if ls $flavour* 1>/dev/null 2>&1 ; then
-                   rsync --times --partial -az --quiet $flavour* $RSYNC_MIRROR/$flavour/
-                 fi
-  done
+for flavour in $FLAVOURS; do
+  if ls $flavour* 1>/dev/null 2>&1 ; then
+    rsync --times --partial -az --quiet $flavour* $RSYNC_MIRROR/$flavour/
+  fi
 done
 
 ## END OF FILE #################################################################
-- 
2.1.4