98-clean-chroot: check existence of aptitude binary via $ROOTCMD.

[grml-live.git] / buildd / cleanup.sh

diff --git a/buildd/cleanup.sh b/buildd/cleanup.sh
index 3d64346..d0e6fe7 100755 (executable)
--- a/buildd/cleanup.sh
+++ b/buildd/cleanup.sh
@@ -8,10 +8,30 @@
 
 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 :)
@@ -19,9 +39,9 @@ cd $MIRROR_DIRECTORY || exit 2
 DAYS=3
 
 REMOVE_ME=""
-for flavour in grml-medium_lenny   grml-medium_squeeze   grml-medium_sid   grml-small_lenny   grml-small_squeeze  grml-small_sid \
-               grml64-medium_lenny grml64-medium_squeeze grml64-medium_sid grml64-small_lenny grml64-small_squeeze grml64-small_sid \
-               grml64_lenny grml64_squeeze grml64_sid grml_lenny grml_squeeze grml_sid ; 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")
@@ -37,13 +57,13 @@ done
 for file in $REMOVE_ME ; do
     test -f ${file}     && rm -f $file
     # ... but keep their md5sum / sha1sum:
-    test -f ${file}.md5  && mv ${file}.md5   .archive
+    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 #################################################################