X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=scripts%2Fdebian%2Fbyhand-code-sign;h=fbd6855d76dea5f5689d66b1f3873d10ce9b57d9;hp=8038813ed83cdd19b4ac4b8ce0f26eafbf78b3b6;hb=be8648509d039e6737fa601c61884747c6ee094e;hpb=9cc55bf99db30be35f70e19058e4fe5dbdb17ede

diff --git a/scripts/debian/byhand-code-sign b/scripts/debian/byhand-code-sign
index 8038813e..fbd6855d 100755
--- a/scripts/debian/byhand-code-sign
+++ b/scripts/debian/byhand-code-sign
@@ -22,13 +22,19 @@ error() {
 
 export OPENSSL_CONF=/dev/null
 
-# Read dak configuration for security or main archive
-case "$SUITE" in
-    *-security)
+# Read dak configuration for security or main archive.
+# Also determine subdirectory for the suite.
+case "$0" in
+    /srv/security-master.debian.org/*)
 	configdir="/srv/security-master.debian.org/dak/config/debian-security"
+	suitedir="$SUITE/updates"
 	;;
-    *)
+    /srv/ftp-master.debian.org/*)
 	configdir="/srv/ftp-master.debian.org/dak/config/debian"
+	suitedir="$SUITE"
+	;;
+    *)
+	error "$0: Can't tell if security or not"
 	;;
 esac
 . "$configdir/vars"
@@ -41,7 +47,7 @@ for var in EFI_BINARY_PRIVKEY EFI_BINARY_CERT \
 	test -n "${!var}" || error "$var is empty in configuration"
 done
 
-TARGET="$ftpdir/dists/$SUITE/main/code-sign/"
+TARGET="$ftpdir/dists/$suitedir/main/code-sign/"
 OUT_TARBALL="$TARGET/${IN_TARBALL##*/}"
 OUT_TARBALL="${OUT_TARBALL%.tar.xz}_sigs.tar.xz"