Various tweaks

3 files changed, 19 insertions, 2 deletions

diff --git a/etc/bootstrap/bbot-bootstrap-macos.sh b/etc/bootstrap/bbot-bootstrap-macos.sh
new file mode 100755
index 0000000..e0a8ac7
--- /dev/null
+++ b/etc/bootstrap/bbot-bootstrap-macos.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# open -a Terminal -n -F ~/bbot-bootstrap-macos.sh
+
+if ~/bbot-bootstrap.sh --cxx clang++ --build /tmp \
+		       --environment "$HOME/environment"; then
+  sleep 2
+  sudo shutdown -h now
+fi
diff --git a/etc/bootstrap/bbot-bootstrap-msvc.bat b/etc/bootstrap/bbot-bootstrap-msvc.bat
index de8b297..4b60f5d 100644
--- a/etc/bootstrap/bbot-bootstrap-msvc.bat
+++ b/etc/bootstrap/bbot-bootstrap-msvc.bat
@@ -66,7 +66,7 @@ cd %BUILD%\bootstrap
 @rem forever.
 @rem
 :restart
-curl -s -S -O --connect-timeout 5 --max-time 30^
+curl -s -S -O --connect-timeout 5 --max-time 60^
   "tftp://%tftp%/build2-baseutils-x86_64-windows.zip"
 @if errorlevel 1 goto restart
 
diff --git a/etc/bootstrap/bbot-bootstrap.sh b/etc/bootstrap/bbot-bootstrap.sh
index 65deddc..9473abe 100755
--- a/etc/bootstrap/bbot-bootstrap.sh
+++ b/etc/bootstrap/bbot-bootstrap.sh
@@ -100,7 +100,15 @@ run rm -rf "$build/bootstrap"
 run mkdir -p "$build/bootstrap"
 run cd "$build/bootstrap"
 
-run curl -s -S -O "tftp://$tftp/build2-toolchain.tar.xz"
+# We could be running on a new network which may take some time to setup.
+# And if we start before that happens, we will be hanging forever.
+#
+while true; do
+  diag "+ curl -s -S -O --connect-timeout 5 --max-time 60 tftp://$tftp/build2-toolchain.tar.xz"
+  if      curl -s -S -O --connect-timeout 5 --max-time 60 "tftp://$tftp/build2-toolchain.tar.xz"; then
+    break
+  fi
+done
 run tar -xf build2-toolchain.tar.xz
 run rm build2-toolchain.tar.xz