X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=buildd%2Fcleanup.sh;h=d0e6fe7c36006eb56ab9e01e56c4c4f5a38e12d4;hp=ef8b2b458cedbdadc7a848ee9047a864ee5700ee;hb=c315d7d3e9723213b01ff2acd1e414f10d79dd53;hpb=f96dfbfc04c41274fc0f2ec94a2951382eef4081

diff --git a/buildd/cleanup.sh b/buildd/cleanup.sh
index ef8b2b4..d0e6fe7 100755
--- 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 :)
@@ -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 #################################################################