aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-08-06 19:20:17 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-08-06 19:20:17 +0200
commitb0cfa2cf7956827447685c2b044556c1ca8dc5c4 (patch)
treeeb2fdb392ea407aa2bb94dd5779cb075331a9816
parentfa6875384e70f2c9bf2e871991db22839cf6fbd5 (diff)
Add shutdown to bootstrap script
Qemu's system_powerdown is proving to be useless.
-rwxr-xr-xetc/bootstrap/bbot-bootstrap-macos.sh7
-rw-r--r--etc/bootstrap/bbot-bootstrap-mingw.bat3
-rw-r--r--etc/bootstrap/bbot-bootstrap-msvc-14.bat3
-rw-r--r--etc/bootstrap/bbot-bootstrap-msvc-15.bat3
-rwxr-xr-xetc/bootstrap/bbot-bootstrap.sh5
5 files changed, 16 insertions, 5 deletions
diff --git a/etc/bootstrap/bbot-bootstrap-macos.sh b/etc/bootstrap/bbot-bootstrap-macos.sh
index 8fee3b9..039e802 100755
--- a/etc/bootstrap/bbot-bootstrap-macos.sh
+++ b/etc/bootstrap/bbot-bootstrap-macos.sh
@@ -2,8 +2,5 @@
# open -a Terminal -n -F ~/bbot-bootstrap-macos.sh
-if ~/bbot-bootstrap.sh --cxx clang++ --build /tmp \
- --environments "$HOME/environments"; then
- sleep 2
- sudo shutdown -h now
-fi
+~/bbot-bootstrap.sh --cxx clang++ --build /tmp \
+ --environments "$HOME/environments"
diff --git a/etc/bootstrap/bbot-bootstrap-mingw.bat b/etc/bootstrap/bbot-bootstrap-mingw.bat
index b64d977..1280c1c 100644
--- a/etc/bootstrap/bbot-bootstrap-mingw.bat
+++ b/etc/bootstrap/bbot-bootstrap-mingw.bat
@@ -165,6 +165,9 @@ bbot-worker --bootstrap >manifest
curl -s -S --upload-file manifest "tftp://%tftp%/manifest"
@if errorlevel 1 goto error
+shutdown /s /t 10
+@if errorlevel 1 goto error
+
@echo off
goto end
diff --git a/etc/bootstrap/bbot-bootstrap-msvc-14.bat b/etc/bootstrap/bbot-bootstrap-msvc-14.bat
index ec63994..376fe69 100644
--- a/etc/bootstrap/bbot-bootstrap-msvc-14.bat
+++ b/etc/bootstrap/bbot-bootstrap-msvc-14.bat
@@ -158,6 +158,9 @@ bbot-worker --bootstrap >manifest
curl -s -S --upload-file manifest "tftp://%tftp%/manifest"
@if errorlevel 1 goto error
+shutdown /s /t 10
+@if errorlevel 1 goto error
+
@echo off
goto end
diff --git a/etc/bootstrap/bbot-bootstrap-msvc-15.bat b/etc/bootstrap/bbot-bootstrap-msvc-15.bat
index b33e990..87d36b5 100644
--- a/etc/bootstrap/bbot-bootstrap-msvc-15.bat
+++ b/etc/bootstrap/bbot-bootstrap-msvc-15.bat
@@ -156,6 +156,9 @@ bbot-worker --bootstrap >manifest
curl -s -S --upload-file manifest "tftp://%tftp%/manifest"
@if errorlevel 1 goto error
+shutdown /s /t 10
+@if errorlevel 1 goto error
+
@echo off
goto end
diff --git a/etc/bootstrap/bbot-bootstrap.sh b/etc/bootstrap/bbot-bootstrap.sh
index 9e7ace8..ec046ca 100755
--- a/etc/bootstrap/bbot-bootstrap.sh
+++ b/etc/bootstrap/bbot-bootstrap.sh
@@ -137,3 +137,8 @@ run rm -r "$config"
#
run bbot-worker --bootstrap >manifest
run curl -s -S --upload-file manifest "tftp://$tftp/manifest"
+
+# Wait a bit and shutdown.
+#
+sleep 2
+sudo shutdown -h now