[incubator-openwhisk-release] branch master updated: Fix the signature issue (#40)

[ho...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

houshengbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-release.git


The following commit(s) were added to refs/heads/master by this push:
     new 3cb30de  Fix the signature issue (#40)
3cb30de is described below

commit 3cb30de947ea69b3f6c2d5fd7b8fc66efa992356
Author: violagao <33...@users.noreply.github.com>
AuthorDate: Tue Feb 13 00:13:42 2018 -0500

    Fix the signature issue (#40)
---
 tools/install_dependencies.sh  | 3 +--
 tools/sign_artifacts.sh        | 3 +--
 tools/travis/import_pgp_key.sh | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/install_dependencies.sh b/tools/install_dependencies.sh
index ca365bc..38a7c4f 100755
--- a/tools/install_dependencies.sh
+++ b/tools/install_dependencies.sh
@@ -16,8 +16,7 @@ elif [ $sysOS == "Linux" ];then
     fi
     if [ $DISTRO == "Ubuntu" ];then
         echo "This is Ubuntu."
-        sudo apt-get install jq
-        sudo apt-get install gnupg
+        sudo apt-get install jq gnupg expect
     fi
 else
 	echo "Other OS: $sysOS. Please manually install jq library."
diff --git a/tools/sign_artifacts.sh b/tools/sign_artifacts.sh
index a4b0992..c43a166 100755
--- a/tools/sign_artifacts.sh
+++ b/tools/sign_artifacts.sh
@@ -40,8 +40,7 @@ for artifact in *.tar.gz; do
         # The option --passphrase-fd does not work on Mac.
         `gpg --yes --armor --output ${artifact}.asc --detach-sig ${artifact}`
     elif [ $sysOS == "Linux" ];then
-        echo "started to sign it"
-        `echo $passphrase | gpg -c -q --passphrase-fd 0 --yes --armor --output ${artifact}.asc --detach-sig ${artifact}`
+        `echo $passphrase | gpg --passphrase-fd 0 --yes --armor --output ${artifact}.asc --detach-sig ${artifact}`
     fi
 done
 
diff --git a/tools/travis/import_pgp_key.sh b/tools/travis/import_pgp_key.sh
index 01e64e5..3211baf 100755
--- a/tools/travis/import_pgp_key.sh
+++ b/tools/travis/import_pgp_key.sh
@@ -14,4 +14,4 @@ gpg --import $PARENTDIR/key_pub.gpg
 echo "Load the private key."
 gpg --allow-secret-key-import --import $PARENTDIR/key_sec.gpg
 
-gpg --list-keys
+expect -c "spawn gpg --edit-key shou@us.ibm.com trust quit; send \"5\ry\r\"; expect eof"

-- 
To stop receiving notification emails like this one, please contact
houshengbo@apache.org.