From 4a20c5d2848560282739e90d369d566aba9503e2 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Mon, 5 Jul 2021 19:19:45 +0200 Subject: [PATCH] Update modules --- .gitmodules | 2 +- etc/ocaml.rc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7ac3abbb..d250eddf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,4 +6,4 @@ url = https://gitlab.com/scemama/irpf90.git [submodule "external/qp2-dependencies"] path = external/qp2-dependencies - url = git@github.com:QuantumPackage/qp2-dependencies.git + url = https://github.com/QuantumPackage/qp2-dependencies.git diff --git a/etc/ocaml.rc b/etc/ocaml.rc index a43f855d..da6de03f 100644 --- a/etc/ocaml.rc +++ b/etc/ocaml.rc @@ -5,8 +5,9 @@ then # Comment these lines if you have a system-wide OCaml installation export PATH="${QP_ROOT}/external/ocaml-bundle/bootstrap/bin:$PATH" - eval $(opam env --root "${QP_ROOT}/external/ocaml-bundle/opam" --set-root) - + if [[ -f "${QP_ROOT}/external/ocaml-bundle/bootstrap/bin/opam" ]] ; then + eval $(opam env --root "${QP_ROOT}/external/ocaml-bundle/opam" --set-root) + fi fi source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true