From 62501ffe6366840b6f6a66be7c0a2c8764f87201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Mon, 18 Mar 2019 13:56:43 +0000
Subject: [PATCH] Make sure we are more resilient to keyserver errors

---
 common/configure_fresh_system.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/common/configure_fresh_system.sh b/common/configure_fresh_system.sh
index 08a0c99c..d01dafcc 100755
--- a/common/configure_fresh_system.sh
+++ b/common/configure_fresh_system.sh
@@ -157,11 +157,18 @@ else
     GPG=gpg
 fi
 
+echo "Getting GPG keys.."
+for key in \
+    409B6B1796C275462A1703113804BB82D39DC0E3 \
+    7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+; do \
+    $GPG --keyserver hkp://keys.gnupg.net --recv-keys "$key" || \
+    $GPG --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
+    $GPG --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys "$key" || \
+    $GPG --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" ; \
+done
+
 if [[ -z $NORUBY ]]; then
-    set +e
-    $GPG --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
-    set -e
-    $GPG --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
     echo "Downloading RVM..."
     $CURL https://get.rvm.io | bash
     set +e