use "set -o pipefail" for shell scripts

[dak.git] / config / debian / cron.weekly

diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index 34f0c64a4a535aa04da929ef51c4f408ddd0e371..52e95eb561b3ce9cb22fd4264e34b1e4c3109211 100755 (executable)
--- a/config/debian/cron.weekly
+++ b/config/debian/cron.weekly
@@ -3,12 +3,13 @@
 # Run once a week via cron, out of dak's crontab.
 
 set -e
+set -o pipefail
 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/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 # Start logging
@@ -31,32 +32,15 @@ if [ ! -z "$(find $ftpdir/pool/ -type d -empty)" ]; then
    find $ftpdir/pool/ -type d -empty | xargs rmdir;
 fi
 
-# Split queue/done
-echo "Splitting queue/done"
-dak split-done > /dev/null
-
-# Vacuum the database
-echo "VACUUM; VACUUM ANALYZE;" | psql --no-psqlrc projectb 2>&1 | grep -v "^NOTICE:  Skipping.*only table owner can VACUUM it$"
-
 # Do git cleanup stuff
 echo "Doing git stuff"
-cd /org/ftp.debian.org/git/dak.git
+cd /srv/ftp.debian.org/git/dak.git
 git gc --prune
 git update-server-info
 # now workaround a git bug not honoring the setup in logs/*
 # (fix in development, but until it reached backports.org.......)
 chmod -R g+w logs/
 
-# Clean up apt-ftparchive's databases
-cd $configdir
-echo "Cleanup apt-ftparchive's database"
-apt-ftparchive -q clean apt.conf
-apt-ftparchive -q clean apt.conf.buildd
-
-# Update wanna-build dump
-echo "Update wanna-build database dump"
-/org/ftp.debian.org/scripts/nfu/get-w-b-db
-
 echo "Fixing symlinks in $ftpdir"
 symlinks -d -r $ftpdir