X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cron.weekly-non-US;h=cda53afe38e6e8ad18f95d72db8538854939959b;hb=d49cf540b71eb561ae369bc861971c43e1cbb779;hp=02e3bf25897c0861ed505a7ef0409ad893f481bd;hpb=e8eacb00ee41d7ab974ba913fff40e5c082b8e1a;p=dak.git

diff --git a/cron.weekly-non-US b/cron.weekly-non-US
index 02e3bf25..cda53afe 100755
--- a/cron.weekly-non-US
+++ b/cron.weekly-non-US
@@ -8,26 +8,19 @@ export SCRIPTVARS=/org/non-us.debian.org/katie/vars-non-US
 
 ################################################################################
 
-echo "Creating pre-weekly-cron-job backup of projectb database..."
-pg_dump projectb > /org/non-us.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
+# Clean out incoming
 
-################################################################################
+shania
 
-# temporary hack to work around the lack of an apt-utils & python-apt package
-export PYTHONPATH=$PYTHONPATH:/org/non-us.debian.org/scripts/apt/build/bin/
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/org/non-us.debian.org/scripts/apt/build/bin/
-export PATH=$PATH:/org/non-us.debian.org/scripts/apt/build/bin/
-export PATH=$PATH:/org/non-us.debian.org/scripts/apt/build/bin/
+# Purge empty directories
 
-cd $masterdir
-shania -v 
-shania -v -m -i $incoming
+if [ ! -z "$(find $ftpdir/pool/ -type d -empty)" ]; then 
+   find $ftpdir/pool/ -type d -empty | xargs rmdir; 
+fi
 
-# TODO: weekly postins to d-c (?), backup of report (?), backup of changes.tgz (?)
+# Clean up apt-ftparchive's databases
 
-################################################################################
-
-echo "Creating post-weekly-cron-job backup of projectb database..."
-pg_dump projectb > /org/non-us.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
+cd $masterdir
+apt-ftparchive -q clean apt.conf-non-US
 
 ################################################################################