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

diff --git a/buildd/cleanup.sh b/buildd/cleanup.sh
index 9a4d5f6..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,8 +38,7 @@ cd $MIRROR_DIRECTORY || exit 2
 DAYS=3
 
 REMOVE_ME=""
-for flavour in grml-small_lenny grml-small_sid grml-medium_lenny grml-medium_sid grml_sid grml_lenny \
-               grml64-small_lenny grml64-small_sid grml64-medium_lenny grml64-medium_sid grml64_sid grml64_lenny ; 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")
@@ -34,15 +52,15 @@ done
 [ -d .archive ] || mkdir .archive
 
 for file in $REMOVE_ME ; do
-    # remove ISOs:
     test -f ${file}     && rm -f $file
-    # ... but keep their md5sum:
-    test -f ${file}.md5 && mv ${file}.md5 .archive
+    # ... but keep their md5sum / sha1sum:
+    test -f ${file}.md5  && mv ${file}.md5  .archive
+    test -f ${file}.sha1 && mv ${file}.sha1 .archive
 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 #################################################################