Merge 7d8b3ba into 83d8b34

TokTok · Mar 24, 2020 · 31e1b0e · 31e1b0e
2 parents 83d8b34 + 7d8b3ba
commit 31e1b0e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/bin/compile b/bin/compile
@@ -13,10 +13,10 @@ export OPAMROOT="$CACHE_DIR/opam"
 echo "/tmp/opam
 Y" | sh <(curl -sL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh)
 
-# Enter source directory.
+# Enter source directory, install opam and dependencies.
 cd "$BUILD_DIR"
-
-. "$BUILD_DIR/bin/install-deps"
+bin/install-deps --no-backup
+eval $(opam env)
 
 # Build our app.
 dune build --profile release
diff --git a/bin/install-deps b/bin/install-deps
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-set -eux
+set -eu
 
 # Set up opam, install dune and menhir (it's not a library dependency).
-opam init --disable-sandboxing -n
+opam init --disable-sandboxing -n "$@"
 opam install dune menhir -y
 
 eval $(opam env)

diff --git a/web/apigen.ml b/web/apigen.ml
@@ -24,7 +24,7 @@ let wrap req_of_yojson res_to_yojson f req =
     in
     respond 0 res_to_yojson (f decoded)
   with e ->
-    respond 0 text_to_yojson (Printexc.to_string e)
+    respond 1 text_to_yojson (Printexc.to_string e)
 
 let () =
   let port_ = ref 8080 in