diff --git a/hack/install.sh b/hack/install.sh index 23f202319f..cc20d69396 100644 --- a/hack/install.sh +++ b/hack/install.sh @@ -406,11 +406,17 @@ do_install() { ( set -x; $sh_c 'sleep 3; apt-get install -y -q curl ca-certificates' ) curl='curl -sSL' fi - if [ ! -e /usr/bin/gpg ]; then + if ! command -v gpg > /dev/null; then apt_get_update ( set -x; $sh_c 'sleep 3; apt-get install -y -q gnupg2 || apt-get install -y -q gnupg' ) fi + # dirmngr is a separate package in ubuntu yakkety; see https://bugs.launchpad.net/ubuntu/+source/apt/+bug/1634464 + if ! command -v dirmngr > /dev/null; then + apt_get_update + ( set -x; $sh_c 'sleep 3; apt-get install -y -q dirmngr' ) + fi + ( set -x for key_server in $key_servers ; do