X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=buildd%2Fcleanup.sh;h=d0e6fe7c36006eb56ab9e01e56c4c4f5a38e12d4;hb=9ecfe247e7be30841a5bfb893cc4a9cf3c45be70;hp=69e48bb53e5828e6b50b719d9ef7ba6d2470d80f;hpb=9e76910676247609e681ee4d1b7f4d955ca288dc;p=grml-live.git

diff --git a/buildd/cleanup.sh b/buildd/cleanup.sh
index 69e48bb..d0e6fe7 100755
--- a/buildd/cleanup.sh
+++ b/buildd/cleanup.sh
@@ -4,15 +4,34 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Sun Dec 09 18:02:43 CET 2007 [mika]
 ################################################################################
 
 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
+
+# mail address where reports should be sent to
+if [ -z "$STORAGE_ADMIN" ] ; then
+  echo "Error: \$STORAGE_ADMIN 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 :)
@@ -20,8 +39,9 @@ cd $MIRROR_DIRECTORY || exit 2
 DAYS=3
 
 REMOVE_ME=""
-for flavour in grml-small_etch grml-small_sid grml-medium_etch grml-medium_sid grml_sid grml_etch \
-               grml64-small_etch grml64-small_sid grml64-medium_etch grml64-medium_sid grml64_sid grml64_etch ; do
+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
   FILE_COUNT=$(ls -1 $flavour/$flavour*.iso | wc -l)
   if [ "$FILE_COUNT" -gt "$DAYS" ] ; then
      FILES=$(ls -1 $flavour/$flavour*.iso | tail -"$DAYS")
@@ -35,15 +55,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 "deleted files $REMOVE_ME" | mail -s "daily-builds cleanup script" "$STORAGE_ADMIN"
 fi
 
 ## END OF FILE #################################################################