Merge branch 'master' into security

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

diff --git a/scripts/debian/byhand-task b/scripts/debian/byhand-task
index 8caf9422eafbeb2fa2e37ffde04d509e1c01ccf8..82f0964482889732c6f506cfff5a0bd3841d259d 100755 (executable)
--- a/scripts/debian/byhand-task
+++ b/scripts/debian/byhand-task
@@ -5,6 +5,9 @@ if [ $# -lt 4 ]; then
         exit 1
 fi
 
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
+. $SCRIPTVARS
+
 INPUT="$1"      # Tarball to read, compressed with gzip
 VERSION="$2"
 ARCH="$3"
@@ -35,7 +38,7 @@ esac
 CHECKRE='^[a-z0-9A-Z.+-]+[[:space:]]+Task[[: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`"
@@ -58,7 +61,7 @@ mv "$OUTMAIN"           "$TARGET"task
 
 chmod 644 "$TARGET"task
 
-(cd $TARGET && ./mk-extra-overrides.sh)
+(cd $TARGET && $scriptsdir/mk-extra-overrides.sh)
 
 trap - EXIT