From 7413ac22d6151de0389a5c0a8cbb8d04def65d28 Mon Sep 17 00:00:00 2001 From: John David Pressman Date: Sat, 8 Jun 2019 15:19:47 -0700 Subject: [PATCH] Add oneshell to makefile and fix filename bug in build env script --- makefile | 1 + scripts/install_build_environment.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/makefile b/makefile index 0cf6ca549..e9596f6c1 100644 --- a/makefile +++ b/makefile @@ -1,5 +1,6 @@ # Use install-deps instead of 'install' because usually 'make install' adds a # binary to the system path and we don't want to confuse users +.ONESHELL: install-deps: # Install ligo/tezos specific system-level dependencies sudo scripts/install_native_dependencies.sh diff --git a/scripts/install_build_environment.sh b/scripts/install_build_environment.sh index fcf77f06a..4d5e36400 100755 --- a/scripts/install_build_environment.sh +++ b/scripts/install_build_environment.sh @@ -33,7 +33,7 @@ else # extinct at this point right? curl -L https://github.com/ocaml/opam/releases/download/2.0.4/opam-2.0.4-x86_64-linux \ --output opam_temp_version_2_0_4.bin - if [ "`openssl sha256 -r opam`" = "373e34f92f282273d482537f8103caad0d17b6f2699ff504bed77f474cb0c951 *opam" ] + if [ "`openssl sha256 -r opam_temp_version_2_0_4.bin`" = "373e34f92f282273d482537f8103caad0d17b6f2699ff504bed77f474cb0c951 *opam_temp_version_2_0_4.bin" ] then # Stay paranoid, in case other checks fail don't want to overrwrite # user's opam on accident