From ebf8ab9d674570c0bd65d4b3190d6f8ae23e65fd Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Thu, 18 Dec 2008 04:08:32 +0000
Subject: enhanced gpg integration

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@673 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/src/createpkg | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'trunk/src/createpkg')

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 86be854..fe908b5 100644
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -437,6 +437,7 @@ function update_metadata {
 
   cd $makepkg_repos
 
+  repo_gpg_key $makepkg_repos
   gen_meta $SUBFOLDER/$PKG_NAME
   gen_filelist
   update_md5_checksum $makepkg_repos $SUBFOLDER/$PKG_NAME
@@ -697,10 +698,16 @@ if [ $SIGN_PACKAGES -eq $on ]; then
 
   echo "Signing package..."
 
+  check_gnupg $SIGN_PACKAGES_USER
+
   if [ ! -z "$SIGN_PACKAGES_KEYID" ]; then
     SIGN_KEYID="-u $SIGN_PACKAGES_KEYID"
   else
-    SIGN_KEYID=""
+    if [ ! -z "$SIGN_PACKAGES_USER" ]; then
+      SIGN_KEYID="-u `su $SIGN_PACKAGES_USER -c "gpg --list-secret-keys --with-colons | grep ^sec | head -n 1 | cut -d : -f 5"`"
+    else
+      SIGN_KEYID="-u `gpg --list-secret-keys --with-colons | grep ^sec | head -n 1 | cut -d : -f 5`"
+    fi
   fi
 
   if [ ! -z "$SIGN_PACKAGES_USER" ]; then
-- 
cgit v1.2.3