X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fbackports%2Fcron.weekly;h=097aa63cf7fcc3672e9efc3091d946857ebb1c5d;hb=2f30eb272c2dfbdb3544d7e0a0e120a9e4be3294;hp=9a563aa5c579420a5e11de511a5fdd30018a51d2;hpb=fa35358d461b03ff5833385ca2970cecce454d0e;p=dak.git

diff --git a/config/backports/cron.weekly b/config/backports/cron.weekly
index 9a563aa5..097aa63c 100755
--- a/config/backports/cron.weekly
+++ b/config/backports/cron.weekly
@@ -1,22 +1,51 @@
-#!/bin/sh
+#!/bin/bash
 #
-# Run once a week via cron, out of katie's crontab.
 
 set -e
-export SCRIPTVARS=/srv/backports-master.debian.org/config/backports/vars
+set -u
+# ERR traps should be inherited from functions too. (And command
+# substitutions and subshells and whatnot, but for us the functions is
+# the important part here)
+set -E
+export SCRIPTVARS=/srv/backports-master.debian.org/dak/config/backports/vars
 . $SCRIPTVARS
 
+# Start logging
+NOW=`date "+%Y.%m.%d-%H:%M:%S"`
+LOGFILE="$logdir/weekly_${NOW}.log"
+exec > "$LOGFILE" 2>&1
+
+cleanup() {
+  echo "Cleanup"
+  rm -f "$LOGFILE"
+}
+trap cleanup 0
+
 ################################################################################
 
 # Purge empty directories
-
+echo "Purging empty directories in $ftpdir/pool/"
 if [ ! -z "$(find $ftpdir/pool/ -type d -empty)" ]; then
    find $ftpdir/pool/ -type d -empty | xargs rmdir;
 fi
 
 # Clean up apt-ftparchive's databases
 
+echo "Splitting queue/done"
+dak split-done
+
+# Clean up apt-ftparchive's databases
 cd $configdir
-apt-ftparchive -q clean apt.conf
+#echo "Cleanup apt-ftparchive's database"
+#apt-ftparchive -q clean apt.conf
+
+echo "Fixing symlinks in $ftpdir"
+symlinks -d -r $ftpdir
+
+echo "Finally, all is done, compressing logfile"
+exec > /dev/null 2>&1
+
+bzip2 -9 "$LOGFILE"
+
 
 ################################################################################