You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2018/02/01 18:59:50 UTC
[2/2] allura git commit: Update gpg handling commands in release
script
Update gpg handling commands in release script
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/e3485071
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e3485071
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e3485071
Branch: refs/heads/master
Commit: e34850716a6e328afcdd08f3cde36c92e40443e5
Parents: dd5a540
Author: Dave Brondsema <da...@brondsema.net>
Authored: Thu Feb 1 13:59:31 2018 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Thu Feb 1 13:59:31 2018 -0500
----------------------------------------------------------------------
scripts/asf-release.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/e3485071/scripts/asf-release.sh
----------------------------------------------------------------------
diff --git a/scripts/asf-release.sh b/scripts/asf-release.sh
index fd76270..2aaa0b6 100755
--- a/scripts/asf-release.sh
+++ b/scripts/asf-release.sh
@@ -56,10 +56,9 @@ git commit -m "CHANGES updated for ASF release $VERSION"
DEFAULT_KEY=`grep ^default-key ~/.gnupg/gpg.conf | sed -e 's/default-key //'`
if [[ -z "$DEFAULT_KEY" ]]; then
- DEFAULT_KEY=`gpg --list-secret-keys | head -3 | tail -1 | sed -e 's/^.*\///' | sed -e 's/ .*//'`
+ DEFAULT_KEY=`gpg --list-secret-keys | egrep '[0-9A-F]{8}' | head -1 | sed -e 's/\W//g'`
fi
prompt KEY "PGP Key to sign with" "$DEFAULT_KEY"
-FINGERPRINT=`gpg --fingerprint $KEY | grep fingerprint | cut -d' ' -f 17-20 | sed -e 's/ //g'`
prompt RAT_LOG_PASTEBIN_URL "URL for RAT log pastebin (see scripts/src-license-check to create RAT report)"
@@ -112,8 +111,8 @@ Checksums:
The KEYS file can be found at:
http://www.apache.org/dist/allura/KEYS
-The release has been signed with key ($KEY):
- http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0x$FINGERPRINT
+The release has been signed with key $KEY:
+ http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0x$KEY
Source corresponding to this release can be found at:
Commit: $COMMIT_SHA