X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cron.weekly;h=54d68b94309630b180372c168023fdb997d964a0;hb=4a37809c0bcc3a451d3d51b29e3fcc3cfe805097;hp=bafca02ecdbc9905429421852112fbff09d945e8;hpb=e8eacb00ee41d7ab974ba913fff40e5c082b8e1a;p=dak.git

diff --git a/cron.weekly b/cron.weekly
index bafca02e..54d68b94 100755
--- a/cron.weekly
+++ b/cron.weekly
@@ -8,25 +8,18 @@ export SCRIPTVARS=/org/ftp.debian.org/katie/vars
 
 ################################################################################
 
-echo "Creating pre-weekly-cron-job backup of projectb database..."
-pg_dump projectb > /org/ftp.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
+# Clean out incoming
 
-################################################################################
-
-# temporary hack to work around the lack of an apt-utils & python-apt package
-export PYTHONPATH=$PYTHONPATH:/org/ftp.debian.org/scripts/apt/build/bin/
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/org/ftp.debian.org/scripts/apt/build/bin/
-export PATH=$PATH:/org/ftp.debian.org/scripts/apt/build/bin/
+shania
 
-cd $masterdir
-shania -v 
-shania -v -m -i $incoming
+# Purge empty directories
 
-# TODO: weekly postins to d-c (?), backup of report (?), backup of changes.tgz (?)
+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 "Creating post-weekly-cron-job backup of projectb database..."
-pg_dump projectb > /org/ftp.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
+apt-ftparchive clean apt.conf
 
 ################################################################################