X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=buildd%2Fcleanup.sh;h=93457ab1c1fef97385819f327f830e80b13eb54a;hp=9ec7c31b85276a8c6519d1db5a3fab34f42dd8e8;hb=db5741b5b41210da401504a3493d9a284da32e9c;hpb=a08d1d1423c19cd5faa088cd42cf55871cd6776b

diff --git a/buildd/cleanup.sh b/buildd/cleanup.sh
index 9ec7c31..93457ab 100755
--- a/buildd/cleanup.sh
+++ b/buildd/cleanup.sh
@@ -8,10 +8,29 @@
 
 set -e
 
-. /etc/grml/grml-buildd.conf
+dir="$(dirname $0)"
 
-[ -n "$MIRROR_DIRECTORY" ] || exit 1
-cd $MIRROR_DIRECTORY || exit 2
+if [ -r /etc/grml/grml-buildd.conf ] ; then
+  . /etc/grml/grml-buildd.conf
+elif [ -r "${dir}/grml-buildd.conf" ] ; then
+  . "${dir}/grml-buildd.conf"
+fi
+
+# directory where daily ISOs are stored locally
+if [ -z "$MIRROR_DIRECTORY" ] ; then
+  echo "Error: \$MIRROR_DIRECTORY is not set. Exiting." >&2
+  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 3
+fi
 
 # we want to always keep a few images, no matter how old they are
 # but get rid of the oldest ones first of course :)
@@ -19,9 +38,7 @@ cd $MIRROR_DIRECTORY || exit 2
 DAYS=3
 
 REMOVE_ME=""
-for flavour in grml-medium_squeeze   grml-medium_wheezy   grml-medium_sid   grml-small_squeeze   grml-small_wheezy  grml-small_sid \
-               grml64-medium_squeeze grml64-medium_wheezy grml64-medium_sid grml64-small_squeeze grml64-small_wheezy grml64-small_sid \
-               grml64_squeeze grml64_wheezy grml64_sid grml_squeeze 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")
@@ -43,7 +60,7 @@ done
 
 # inform on successful removal:
 if [ "$(echo "$REMOVE_ME" | tr -d ' ' )" != "" ] ; then
-   echo "deleted files $REMOVE_ME" | mail -s "daily-builds cleanup script" mika@grml.org
+   echo "Removed previous files $REMOVE_ME" | logger -t grml-buildd
 fi
 
 ## END OF FILE #################################################################