X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.hourly;h=80c912f854873ce59b3b413e9f814881f2726008;hb=6e012f42e8cfdb8487564a2ff34554d31d53a2af;hp=aef24c09515a023aa49b7fad2521cd080b6de4f5;hpb=ad5be7226f952dd48ec4d6283a67ceeaa843f92d;p=dak.git

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index aef24c09..80c912f8 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -1,26 +1,36 @@
-#! /bin/sh
+#! /bin/bash
 #
 # Executed hourly via cron, out of dak's crontab.
 
 set -e
+set -o pipefail
 set -u
 
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
+PROGRAM="Hourly"
+########################################################################
+# Functions                                                            #
+########################################################################
+# common functions are "outsourced"
+. "${configdir}/common"
+
 dak import-users-from-passwd
-dak queue-report -n > $webdir/new.html
-dak queue-report -8 -d new,byhand,proposedupdates,oldproposedupdates -r $webdir/stat
-dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
-dak graph -n new,byhand,proposedupdates,oldproposedupdates,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
 
 # do not run show-new and other stuff in parallel
 LOCKFILE="$lockdir/unchecked.lock"
 if lockfile -r16 $LOCKFILE 2> /dev/null; then
-    dak show-new > /dev/null
+    do_new
+    dak show-new > /dev/null || true
     rm -f $LOCKFILE
 fi
 
+dak queue-report -n > $webdir/new.html
+dak queue-report -8 -d new,byhand,stable-new,oldstable-new -r $webdir/stat
+dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
+dak graph -n new,byhand,p-u-new,o-p-u-new,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
+
 cd $webdir
 cat removals-20*.txt > removals-full.txt
 cat removals.txt >> removals-full.txt