fixes

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index a36266f6365d2a43a0b97bd8c520d02ded65acde..0746d8286aa044bdcb425a004f41a3aec378168a 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -838,7 +838,11 @@ case $HOSTNAME in
 deb http://ppa.launchpad.net/system76-dev/stable/ubuntu $codename_compat main
 deb-src http://ppa.launchpad.net/system76-dev/stable/ubuntu $codename_compat main
 EOF
-      s apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5D1F3A80254F6AFBA254FED5ACD442D1C8B7748B
+      # ubuntu keyserver is prone to intermittent failures
+      for (( i=0; i <= 4 ; i++ )); do
+        s apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5D1F3A80254F6AFBA254FED5ACD442D1C8B7748B && break
+        sleep 10
+      done
       p update
       # https://support.system76.com/articles/install-ubuntu/
       # but i'm hoping this is not needed
@@ -869,7 +873,10 @@ case $distro in
 deb http://ppa.launchpad.net/obsproject/obs-studio/ubuntu $codename_compat main
 deb-src http://ppa.launchpad.net/obsproject/obs-studio/ubuntu $codename_compat main
 EOF
-      s apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BC7345F522079769F5BBE987EFC71127F425E228
+      for (( i=0; i <= 4 ; i++ )); do
+        s apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BC7345F522079769F5BBE987EFC71127F425E228 && break
+        sleep 10
+      done
       p update
     fi
     ;;