From 273d46d3eaf39496dfd741ffe2ee3c2629516212 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <t.applencourt@gmail.com>
Date: Mon, 8 Jun 2015 15:38:37 +0200
Subject: [PATCH] Fix ocaml instalation

---
 install/scripts/install_ocaml.sh | 3 +--
 setup_environment.py             | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/install/scripts/install_ocaml.sh b/install/scripts/install_ocaml.sh
index a2f2ffae..415f7585 100755
--- a/install/scripts/install_ocaml.sh
+++ b/install/scripts/install_ocaml.sh
@@ -28,8 +28,7 @@ then
    echo "Installation of OPAM failed"
    exit 2
 fi
-${QP_ROOT}/bin/opam config setup -a --dot-profile ${QP_ROOT}/qmcchemrc || exit 1
-touch ${QP_ROOT}/bin/opam
+${QP_ROOT}/bin/opam config setup -a || exit 1
 
 export LD_LIBRARY_PATH=${QP_ROOT}/lib:${LD_LIBRARY_PATH}
 export LIBRARY_PATH=${QP_ROOT}/lib:${LIBRARY_PATH}
diff --git a/setup_environment.py b/setup_environment.py
index e866ea1c..f0676757 100755
--- a/setup_environment.py
+++ b/setup_environment.py
@@ -41,7 +41,7 @@ path_github = {"head": "http://github.com/", "tail": "archive/master.tar.gz"}
 
 ocaml = Info(
     url='http://raw.github.com/ocaml/opam/master/shell/opam_installer.sh',
-    description=' ocaml',
+    description=' ocaml (it will take some time)',
     default_path=join(QP_ROOT_BIN, "opam"))
 
 m4 = Info(
@@ -236,9 +236,9 @@ if "ninja" in l_need_genealogy:
     extension = splitext(url)[1]
     path_archive = "Downloads/{0}{1}".format("ninja", extension)
 
-    l_cmd = ["cd install;",
-             "wget {0} -O {1} -o /dev/null ;".format(url, path_archive),
-             "./scripts/install_ninja.sh", "cd -"]
+    l_cmd = ["cd install &&",
+             "wget {0} -O {1} -o /dev/null &&".format(url, path_archive),
+             "./scripts/install_ninja.sh &&", "cd -"]
 
     check_output(" ".join(l_cmd), shell=True)