From d3383d8bfe25f8a83473a41501a442cd1d319b86 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sun, 31 Jan 2021 23:12:51 +0100
Subject: fix gpg signing for -u flag

---
 scripts/prepareForDistribution.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/prepareForDistribution.sh b/scripts/prepareForDistribution.sh
index 2caea029..efb08c35 100755
--- a/scripts/prepareForDistribution.sh
+++ b/scripts/prepareForDistribution.sh
@@ -77,12 +77,9 @@ function sign {
     then
         echo -e "${GREEN} -> gpg sign using key ${GPG_KEY}${NC}"
         gpg --default-key ${GPG_KEY} --armor --output "${FINAL_APK}.sig" --detach-sign ${FINAL_APK} || quit
-        #gpg -u ${GPG_KEY} -sab --output ${FINAL_APK} || quit
     else
-        echo -e "${GREEN} -> gpg sign using pub key of user ${GPG_KEY_USER}${NC}"
-        GPG_KEY=$(gpg --list-keys $GPG_KEY_USER | grep pub | cut -d '/' -f 2 | cut -d ' ' -f 1) || quit
-        #gpg -u ${GPG_KEY} -sab --output ${FINAL_APK} || quit
-        gpg --default-key ${GPG_KEY} --armor --output "${FINAL_APK}.sig" --detach-sign ${FINAL_APK} || quit
+        echo -e "${GREEN} -> gpg sign using key of user ${GPG_KEY_USER}${NC}"
+        gpg -u ${GPG_KEY_USER} --armor --output "${FINAL_APK}.sig" --detach-sign ${FINAL_APK} || quit
     fi
 
     echo -e "${GREEN} -> gpg verify ${FINAL_APK}${NC}"
-- 
cgit v1.2.3