X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=scripts%2Fdebian%2Fgenerate-d-i;h=a5d54dc374caabe128a8e159554cb2b25f8cbe1e;hp=fee0ba5bbe6c21097a8e243ff293fa3d97b1dbb3;hb=abcd0f018dc49a218ce70d22e97fc7b654fcf1c8;hpb=e4619ba4be25b3724b343780d9d32ce8cfbe905a

diff --git a/scripts/debian/generate-d-i b/scripts/debian/generate-d-i
index fee0ba5b..a5d54dc3 100755
--- a/scripts/debian/generate-d-i
+++ b/scripts/debian/generate-d-i
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Original written from Jeroen van Wolffelaar <jeroen@debian.org>
 
 set -e
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 export PAGER=cat
@@ -12,7 +12,7 @@ exec > $webdir/d-i 2>&1
 
 
 echo "udeb's in testing that don't (anymore) correspond to any testing source:"
-psql projectb -c "select b.package, b.version, (SELECT arch_string from
+psql -c "select b.package, b.version, (SELECT arch_string from
 architecture where b.architecture=architecture.id) as arch, s.source from
 bin_associations ba LEFT JOIN binaries b on (ba.bin=b.id) LEFT JOIN source s
 on (b.source=s.id) WHERE ba.suite=4 AND s.id NOT IN (SELECT source from
@@ -20,7 +20,7 @@ src_associations WHERE suite=4) AND b.type = 'udeb' ORDER BY s.source,
 b.package, b.architecture;"
 
 echo "udeb's in unstable that should be in testing too:"
-psql projectb -c "select b.package, b.version, (SELECT arch_string from
+psql -c "select b.package, b.version, (SELECT arch_string from
 architecture where b.architecture=architecture.id) as arch, s.source from
 bin_associations ba LEFT JOIN binaries b on (ba.bin=b.id) LEFT JOIN source s
 on (b.source=s.id) WHERE ba.suite=5 AND NOT EXISTS (SELECT 1 FROM
@@ -29,7 +29,7 @@ source from src_associations WHERE suite=4) AND b.type = 'udeb' AND
 b.architecture NOT IN (4,8,12) ORDER BY s.source, b.package, b.architecture;"
 
 echo "udeb's in t-p-u that should be in testing too:"
-psql projectb -c "select b.package, b.version, (SELECT arch_string from
+psql -c "select b.package, b.version, (SELECT arch_string from
 architecture where b.architecture=architecture.id) as arch, s.source from
 bin_associations ba LEFT JOIN binaries b on (ba.bin=b.id) LEFT JOIN source s
 on (b.source=s.id) WHERE ba.suite=3 AND NOT EXISTS (SELECT 1 FROM