From c83813456ab71ec59b2f0ba64bd098b7c2e8d544 Mon Sep 17 00:00:00 2001
From: Tom Jack <tom@tomjack.co>
Date: Mon, 16 Dec 2019 14:32:10 -0600
Subject: [PATCH] Relocate .opam

---
 docker/distribution/generic/build.Dockerfile | 2 +-
 src/ligo.opam => ligo.opam                   | 0
 scripts/install_native_dependencies.sh       | 6 ++++--
 scripts/install_vendors_deps.sh              | 2 +-
 scripts/setup_switch.sh                      | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)
 rename src/ligo.opam => ligo.opam (100%)

diff --git a/docker/distribution/generic/build.Dockerfile b/docker/distribution/generic/build.Dockerfile
index e183fc683..0e072f10c 100644
--- a/docker/distribution/generic/build.Dockerfile
+++ b/docker/distribution/generic/build.Dockerfile
@@ -26,7 +26,7 @@ RUN opam update
 
 # Install ligo
 RUN sh scripts/install_vendors_deps.sh
-RUN opam install -y ./src
+RUN opam install -y .
 
 # Use the ligo binary as a default command
 ENTRYPOINT [ "/home/opam/.opam/4.07/bin/ligo" ]
diff --git a/src/ligo.opam b/ligo.opam
similarity index 100%
rename from src/ligo.opam
rename to ligo.opam
diff --git a/scripts/install_native_dependencies.sh b/scripts/install_native_dependencies.sh
index 46e354711..2a0e56903 100755
--- a/scripts/install_native_dependencies.sh
+++ b/scripts/install_native_dependencies.sh
@@ -14,7 +14,8 @@ then
         m4 \
         libcap \
         bubblewrap \
-        rsync
+        rsync \
+        git
 
 else
     apt-get update -qq
@@ -27,5 +28,6 @@ else
         m4 \
         libcap-dev \
         bubblewrap \
-        rsync
+        rsync \
+        git
 fi
diff --git a/scripts/install_vendors_deps.sh b/scripts/install_vendors_deps.sh
index 3da674636..15f9b47d4 100755
--- a/scripts/install_vendors_deps.sh
+++ b/scripts/install_vendors_deps.sh
@@ -2,5 +2,5 @@
 set -e
 
 # Install local dependencies
-opam install -y --deps-only --with-test $(find src vendors -name \*.opam)
+opam install -y --deps-only --with-test ./ligo.opam $(find vendors -name \*.opam)
 opam install -y $(find vendors -name \*.opam)
diff --git a/scripts/setup_switch.sh b/scripts/setup_switch.sh
index ee1179109..8810e4483 100755
--- a/scripts/setup_switch.sh
+++ b/scripts/setup_switch.sh
@@ -2,5 +2,5 @@
 set -e
 set -x
 
-printf '' | opam switch create . ocaml-base-compiler.4.07.1 # toto ocaml-base-compiler.4.06.1
+printf '' | opam switch create . ocaml-base-compiler.4.07.1 --no-install
 eval $(opam config env)