Merge branch 'master' into security

[dak.git] / scripts / debian / byhand-tag

diff --git a/scripts/debian/byhand-tag b/scripts/debian/byhand-tag
index e9cb43acc6b07c9031d94193612fc5f8c974fb04..81a8946676a8a3af626813d7e4ac4c8798b98c90 100755 (executable)
--- a/scripts/debian/byhand-tag
+++ b/scripts/debian/byhand-tag
@@ -1,5 +1,8 @@
 #!/bin/sh -ue
 
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
+. $SCRIPTVARS
+
 # Tarball to read, compressed with gzip
 INPUT="${1:?"Usage: $0 filename"}"
 
@@ -7,7 +10,7 @@ INPUT="${1:?"Usage: $0 filename"}"
 CHECKRE='^[a-z0-9A-Z.+-]+[[:space:]]+Tag[[:space:]]+[a-z0-9:. ,{}+-]+$'
 
 # This must end with /
-TARGET=/srv/ftp.debian.org/scripts/external-overrides/
+TARGET=/srv/ftp-master.debian.org/scripts/external-overrides/
 
 # Read the main directory from the tarball
 DIR="`tar ztf \"$INPUT\" | tac | tail -n 1`"
@@ -38,7 +41,7 @@ mv "$OUTNONFREE"        "$TARGET"tag.non-free
 
 chmod 644 "$TARGET"tag "$TARGET"tag.contrib "$TARGET"tag.non-free
 
-(cd $TARGET && ./mk-extra-overrides.sh)
+(cd $TARGET && $scriptsdir/mk-extra-overrides.sh)
 
 trap - EXIT