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

diff --git a/cron.weekly-non-US b/cron.weekly-non-US
index 02e3bf25..fd815287 100755
--- a/cron.weekly-non-US
+++ b/cron.weekly-non-US
@@ -13,15 +13,19 @@ pg_dump projectb > /org/non-us.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
 
 ################################################################################
 
-# 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/
-
-cd $masterdir
-shania -v 
-shania -v -m -i $incoming
+# Clean out incoming
+
+shania
+
+# Purge empty directories
+
+if [ ! -z "$(find $ftpdir/pool/ -type d -empty)" ]; then 
+   find $ftpdir/pool/ -type d -empty | xargs rmdir; 
+fi
+
+# Clean up apt-ftparchive's databases
+
+apt-ftparchive clean apt.conf-non-US
 
 # TODO: weekly postins to d-c (?), backup of report (?), backup of changes.tgz (?)