Skip to content
Browse files

don't use which to test for gpg1 (aborts script with set -e)

  • Loading branch information...
jmcphers committed Aug 13, 2019
1 parent 1389893 commit 48ac3c1e9b8b1536451dbf11eb3017d65990a93f
Showing with 2 additions and 2 deletions.
  1. +2 −2 docker/jenkins/
@@ -49,9 +49,9 @@ trap cleanup EXIT
# if the gpg1 binary is present on this machine, then presume that it exists as
# an alternative to a future, incompatible version, and use it for the "gpg"
# command by manipulating $PATH.
GPG1=$(which gpg1)
if [ "$?" == "0" ]; then
if [ hash gpg1 2>/dev/null ]; then
# emit notice
GPG1=$(which gpg1)
GPG2=$(which gpg)
echo "Note: Using $GPG1 to provide GnuPG (was $GPG2)"
# softlink gpg into our temporary work folder

0 comments on commit 48ac3c1

Please sign in to comment.
You can’t perform that action at this time.