From f5263c8074c091555592787e32319a6a4f39e650 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 31 Jan 2017 16:39:13 -0800 Subject: [PATCH] install dirmngr if needed as of Ubuntu Yakkety, dirmngr is now in a separate package (see https://bugs.launchpad.net/ubuntu/+source/apt/+bug/1634464) this patch updates the install script to install the dirmngr package if it's not installed. Signed-off-by: Sebastiaan van Stijn --- hack/install.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hack/install.sh b/hack/install.sh index b6b5ab8522..f7c6a0b0a7 100644 --- a/hack/install.sh +++ b/hack/install.sh @@ -462,11 +462,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 echo "$docker_key" | apt-key add -