From d187cdbc386165383bbc900a9e984c770ba2e557 Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Sun, 17 Apr 2011 22:51:23 +1000
Subject: Use GPGKEY to select signing key

Use the default key from the gpg keyring to sign packages unless
GPGKEY is specified (either in makepkg.conf or as an environmental
variable).

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
---
 commitpkg | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'commitpkg')

diff --git a/commitpkg b/commitpkg
index 7d533a0..916bdfc 100755
--- a/commitpkg
+++ b/commitpkg
@@ -132,7 +132,10 @@ for _arch in ${arch[@]}; do
 
 		if [[ $SIGNPKG == 'y' ]]; then
 			echo "Signing package ${pkgfile}..."
-			gpg --detach-sign --use-agent -u "${PACKAGER}" "${pkgfile}" || abort
+			if [[ -n $GPGKEY ]]; then
+				SIGNWITHKEY="-u ${GPGKEY}"
+			fi
+			gpg --detach-sign --use-agent ${SIGNWITHKEY} "${pkgfile}" || abort
 		fi
 
 		sigfile="${pkgfile}.sig"
-- 
cgit v1.2.3-70-g09d2