Merge remote branch 'origin/master'

[dak.git] / scripts / debian / buildd-prepare-dir

diff --git a/scripts/debian/buildd-prepare-dir b/scripts/debian/buildd-prepare-dir
index 8366d3c2cfa82fb36b3cb774a1238b2cf74e534b..0c1f08ba93662c4be83f1e6993cca5dcfeba68c4 100755 (executable)
--- a/scripts/debian/buildd-prepare-dir
+++ b/scripts/debian/buildd-prepare-dir
@@ -39,8 +39,9 @@ PROGRAM="buildd-prepare-dir"
 . "${configdir}/common"
 
 # should be relative to the general base dir later
-TARGET="${base}/scripts/builddkeyrings"
 COPYTARGET="${base}/keyrings"
+base="${base}/scripts/builddkeyrings"
+TARGET="${base}/keyrings"
 REMOVED="${base}/removed-buildd-keys.gpg"
 
 mkdir -p "${TARGET}/keyrings"
@@ -57,5 +58,5 @@ sha512sum keyrings/* > sha512sums
 
 rm -f ${TARGET}/sha512sums.txt
 SIGNINGKEY=$(dak admin c signingkeyids)
-gpg --no-options  --batch --no-tty --armour --default-key ${SIGNINKEY} --clearsign -o "${TARGET}/sha512sums.txt" "${TARGET}/sha512sums"
+gpg --no-options  --batch --no-tty --armour --default-key ${SIGNINGKEY} --clearsign -o "${TARGET}/sha512sums.txt" "${TARGET}/sha512sums"
 rm -f ${TARGET}/sha512sums