This is an automated email from the ASF dual-hosted git repository.
luoc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new 82c03e4 Release tools fix
82c03e4 is described below
commit 82c03e44eac3863a10e599d8f2068fc58e986041
Author: Laurent Goujon <[email protected]>
AuthorDate: Thu Jun 3 15:34:35 2021 -0700
Release tools fix
Small fixes for the release tool:
- fix path used to invoke the checksum verification script
- Allow gpg command to be configurable and default to gpg instead of
gpg2 (same as what is mentioned in release documentation).
---
tools/release-scripts/release.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/release-scripts/release.sh b/tools/release-scripts/release.sh
index 442cf90..31aaf72 100755
--- a/tools/release-scripts/release.sh
+++ b/tools/release-scripts/release.sh
@@ -51,7 +51,7 @@ function copyFiles(){
}
function checkPassphrase(){
- echo "1234" | gpg2 --batch --passphrase "${GPG_PASSPHRASE}" -o /dev/null
-as -
+ echo "1234" | "$GPG" --batch --passphrase "${GPG_PASSPHRASE}" -o /dev/null
-as -
if [ $? -ne 0 ]; then
echo "Invalid passphrase. Make sure the default key is set to the key
you want to use (or make it the first key in the keyring)."
exit 1
@@ -129,7 +129,10 @@ cloneRepo(){
###### BEGIN #####
# Location of checksum.sh
-export CHKSMDIR=`pwd`
+export CHKSMDIR="$( cd "$(dirname "$0")" && pwd)"
+
+# Default GPG command to use
+GPG="${GPG:-gpg}"
readInputAndSetup
checkPassphraseNoSpace
