Fix install-deps for OSX bash.

TokTok · Apr 7, 2020 · 1bc4e7e · 1bc4e7e
1 parent cea88ee
commit 1bc4e7e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ cache:
     - $HOME/.opam
 
 install:
-  - bin/install-deps
+  - bin/install-deps --disable-sandboxing
   - eval $(opam env)
 
 script:

diff --git a/bin/install-deps b/bin/install-deps
@@ -1,16 +1,16 @@
 #!/bin/bash
 
-set -eu
+set -eux
 
 # Set up opam, install dune and menhir (it's not a library dependency).
-opam init --disable-sandboxing -n
+opam init -n "$@"
 opam install dune menhir -y
 
 eval $(opam env)
 
 # Install dependencies: we keep installing dependencies until dune stops telling
 # us to install more.
-DUNE_CMD='dune external-lib-deps --missing --profile release @@default |& grep -o "opam install .*" || true'
+DUNE_CMD='dune external-lib-deps --missing --profile release @@default 2>&1 | grep -o "opam install .*" || true'
 INSTALL_CMD="$(eval $DUNE_CMD)"
 while [ -n "$INSTALL_CMD" ]; do
   $INSTALL_CMD -y