X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.daily;h=e4f2571841a8faa5e9667bab6068ccb5fdfe9a9a;hb=f0bfd37e7286156598d79b53501ebe2000bb7924;hp=1815260c0338edbd529205073770df4c7789502a;hpb=0728f1b55afc80016fe27fada8dc78e635d26c60;p=dak.git

diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index 1815260c..e4f25718 100755
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -7,16 +7,25 @@ set -u
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
+# common functions are "outsourced"
+. "${configdir}/common"
+
 ################################################################################
 
+TMPFILE=$( mktemp -p ${TMPDIR} )
+
+function cleanup {
+    ERRVAL=$?
+    rm -f ${TMPFILE}
+    exit ${ERRVAL}
+}
+trap cleanup SIGHUP SIGINT SIGPIPE SIGTERM EXIT ERR
 
 # get the latest list of wnpp bugs and their source packages
-if $( wget -q -O/srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm.tmp http://qa.debian.org/data/bts/wnpp_rm ) ; then
-    mv /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm.tmp /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm
-else
-    if [ -f /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm.tmp ] ; then
-        rm /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm.tmp
-    fi
-fi
+wget -q -O${TMPFILE} http://qa.debian.org/data/bts/wnpp_rm
+chmod go+r ${TMPFILE}
+mv ${TMPFILE} /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm
+
+reports
 
 ################################################################################