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

diff --git a/cron.weekly-non-US b/cron.weekly-non-US
index 02e3bf25..fd6067d0 100755
--- a/cron.weekly-non-US
+++ b/cron.weekly-non-US
@@ -13,15 +13,20 @@ 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
+### [JJT] Disabled until shania is rewritten
+#cd $masterdir
+#shania -v 
+#shania -v -m -i $incoming
+
+# 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 (?)