From c405dc99d3cdd1c9ffa6afc6bb8f91758a1321e5 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Wed, 24 Jul 2019 09:06:11 +0200 Subject: [PATCH] Fixing travis --- configure | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c3ff8942..634b5888 100755 --- a/configure +++ b/configure @@ -303,22 +303,30 @@ EOF rm ${QP_ROOT}/external/opam_installer.sh source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true - ${QP_ROOT}/bin/opam init --verbose --yes --comp=4.07.1 --disable-sandboxing + execute << EOF + ${QP_ROOT}/bin/opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing eval $(${QP_ROOT}/bin/opam env) opam install -y ${OCAML_PACKAGES} || exit 1 +EOF else # Conventional commands execute << EOF chmod +x "\${QP_ROOT}"/external/opam_installer.sh "\${QP_ROOT}"/external/opam_installer.sh --no-backup +EOF + execute << EOF rm --force \${QP_ROOT}/bin/opam export OPAMROOT=\${OPAMROOT:-\${QP_ROOT}/external/opam} echo \${QP_ROOT}/bin \ | sh \${QP_ROOT}/external/opam_installer.sh +EOF + execute << EOF rm \${QP_ROOT}/external/opam_installer.sh source \${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true - \${QP_ROOT}/bin/opam init --verbose --yes --comp=4.07.1 --disable-sandboxing + \${QP_ROOT}/bin/opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing +EOF + execute << EOF eval \$(\${QP_ROOT}/bin/opam env) opam install -y \${OCAML_PACKAGES} || exit 1 EOF