diff options
| author | bors <bors@rust-lang.org> | 2018-11-20 09:25:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-20 09:25:45 +0000 |
| commit | a9b3f97d442fa9e787b169285dab7f8beaf2ced8 (patch) | |
| tree | 506f784a7882cd4e6ee45f4b96d88f3c9e4aca0e /ci/emscripten.sh | |
| parent | 2921accb6e82b88201bc97a4e64abfe176aed446 (diff) | |
| parent | 37a0bd3251aa5942831d1fdfab8b44b76804e0d9 (diff) | |
| download | rust-libc-a9b3f97d442fa9e787b169285dab7f8beaf2ced8.tar.gz | |
Auto merge of #1127 - gnzlbg:fmt, r=gnzlbg
Formatting and shellcheck
Diffstat (limited to 'ci/emscripten.sh')
| -rw-r--r-- | ci/emscripten.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ci/emscripten.sh b/ci/emscripten.sh index d80258584d..ab69aa7514 100644 --- a/ci/emscripten.sh +++ b/ci/emscripten.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # Copyright 2017 The Rust Project Developers. See the COPYRIGHT # file at the top-level directory of this distribution and at # http://rust-lang.org/COPYRIGHT. @@ -17,10 +18,10 @@ echo ERROR: An error was encountered with the build. cat /tmp/build.log exit 1 " - trap "$on_err" ERR + trap '$on_err' ERR bash -c "while true; do sleep 30; echo \$(date) - building ...; done" & PING_LOOP_PID=$! - $@ &> /tmp/build.log + "${@}" &> /tmp/build.log trap - ERR kill $PING_LOOP_PID rm -f /tmp/build.log @@ -37,6 +38,7 @@ hide_output ./emsdk install sdk-1.37.20-64bit ./emsdk activate sdk-1.37.20-64bit # Compile and cache libc +# shellcheck disable=SC1091 source ./emsdk_env.sh echo "main(){}" > a.c HOME=/emsdk-portable/ emcc a.c |