diff --git a/tools/_release.sh b/tools/_release.sh index d78b2ee96..72c394541 100755 --- a/tools/_release.sh +++ b/tools/_release.sh @@ -38,7 +38,7 @@ if [ "$RELEASE_GPG_KEY" = "" ]; then 20F201346BF8F3F455A73F9A780CC99432A28621 " for key in $TRUSTED_KEYS; do - if gpg2 --with-colons --card-status | grep -q "$key"; then + if gpg --with-colons --card-status | grep -q "$key"; then RELEASE_GPG_KEY="$key" break fi @@ -147,7 +147,7 @@ do echo "Signing ($pkg_dir)" for x in dist/*.tar.gz dist/*.whl do - gpg2 -u "$RELEASE_GPG_KEY" --detach-sign --armor --sign --digest-algo sha256 $x + gpg -u "$RELEASE_GPG_KEY" --detach-sign --armor --sign --digest-algo sha256 $x done cd - @@ -189,8 +189,8 @@ deactivate git add certbot/docs/cli-help.txt while ! git commit --gpg-sign="$RELEASE_GPG_KEY" -m "Release $version"; do echo "Unable to sign the release commit using git." - echo "You may have to configure git to use gpg2 by running:" - echo 'git config --global gpg.program $(command -v gpg2)' + echo "You may have to configure git to use gpg by running:" + echo 'git config --global gpg.program $(command -v gpg)' read -p "Press enter to try signing again." done git tag --local-user "$RELEASE_GPG_KEY" --sign --message "Release $version" "$tag" diff --git a/tools/release.sh b/tools/release.sh index ae3e78dc1..645336559 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -19,7 +19,7 @@ CheckVersion() { CheckVersion "$1" CheckVersion "$2" -if [ "$RELEASE_GPG_KEY" = "" ] && ! gpg2 --card-status >/dev/null 2>&1; then +if [ "$RELEASE_GPG_KEY" = "" ] && ! gpg --card-status >/dev/null 2>&1; then echo OpenPGP card not found! echo Please insert your PGP card and run this script again. exit 1