From 013c9b9a0d774ab061ff47babab43f143314f74d Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <t.applencourt@gmail.com>
Date: Thu, 30 Apr 2015 14:44:14 +0200
Subject: [PATCH] Cleaning

---
 setup_environment.sh | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/setup_environment.sh b/setup_environment.sh
index ce522099..657573c0 100755
--- a/setup_environment.sh
+++ b/setup_environment.sh
@@ -18,9 +18,9 @@ export LD_LIBRARY_PATH="\${QPACKAGE_ROOT}"/lib:\${LD_LIBRARY_PATH}
 export LIBRARY_PATH="\${QPACKAGE_ROOT}"/lib:\${LIBRARY_PATH}
 export C_INCLUDE_PATH="\${QPACKAGE_ROOT}"/include:\${C_INCLUDE_PATH}
 
-export PYTHONPATH=${PYTHONPATH}$(find "${QPACKAGE_ROOT}"/scripts -type d -printf ":%p")
+export PYTHONPATH=\${PYTHONPATH}\$(find "${QPACKAGE_ROOT}"/scripts -type d -printf ":%p")
 
-export PATH=${PATH}$(find "${QPACKAGE_ROOT}"/scripts -type d -printf ":%p")
+export PATH=\${PATH}\$(find "${QPACKAGE_ROOT}"/scripts -type d -printf ":%p")
 export PATH=\${PATH}:"\${QPACKAGE_ROOT}"/bin
 export PATH=\${PATH}:"\${QPACKAGE_ROOT}"/ocaml
 source "\${QPACKAGE_ROOT}"/bin/irpman &> /dev/null
@@ -30,40 +30,29 @@ EOF
 source quantum_package.rc
 
 echo "${BLUE}===== Installing IRPF90 ===== ${BLACK}"
-${QPACKAGE_ROOT}/scripts/install/install_irpf90.sh     | tee install_irpf90.log
-if [[ ! -d ${QPACKAGE_ROOT}/irpf90 ]]
-then
-  echo $RED "Error in IRPF90 installation" $BLACK
-  exit 1
-fi
-
-if [[ ! -x ${QPACKAGE_ROOT}/bin/irpf90 ]]
-then
-  echo $RED "Error in IRPF90 installation" $BLACK
-  exit 1
-fi
-
-if [[ ! -x ${QPACKAGE_ROOT}/bin/irpman ]]
+${QPACKAGE_ROOT}/scripts/install/install_irpf90.sh     | tee ${QPACKAGE_ROOT}/install_logs/install_irpf90.log
+if [[ ! -d ${QPACKAGE_ROOT}/irpf90 ]]  ||  [[ ! -x ${QPACKAGE_ROOT}/bin/irpf90 ]] ||  [[ ! -x ${QPACKAGE_ROOT}/bin/irpman ]]
 then
   echo $RED "Error in IRPF90 installation" $BLACK
   exit 1
 fi
 
+mkdir -p ${QPACKAGE_ROOT}/install_logs
 
 echo "${BLUE}===== Installing Zlib ===== ${BLACK}"
-${QPACKAGE_ROOT}/scripts/install/install_zlib.sh       | tee install_zlib.log
+${QPACKAGE_ROOT}/scripts/install/install_zlib.sh       | tee ${QPACKAGE_ROOT}/install_logs/install_zlib.log
 
 echo "${BLUE}===== Installing Curl ===== ${BLACK}"
-${QPACKAGE_ROOT}/scripts/install/install_curl.sh       | tee install_curl.log
+${QPACKAGE_ROOT}/scripts/install/install_curl.sh       | tee ${QPACKAGE_ROOT}/install_logs/install_curl.log
 
 echo "${BLUE}===== Installing M4 ===== ${BLACK}"
-${QPACKAGE_ROOT}/scripts/install/install_m4.sh         | tee install_m4.log
+${QPACKAGE_ROOT}/scripts/install/install_m4.sh         | tee ${QPACKAGE_ROOT}/install_logs/install_m4.log
 
 echo "${BLUE}===== Installing Docopt ===== ${BLACK}"
-${QPACKAGE_ROOT}/scripts/install/install_docopt.sh     | tee install_docopt.log
+${QPACKAGE_ROOT}/scripts/install/install_docopt.sh     | tee ${QPACKAGE_ROOT}/install_logs/install_docopt.log
 
 echo "${BLUE}===== Installing EMSL Basis set library ===== ${BLACK}"
-${QPACKAGE_ROOT}/scripts/install/install_emsl.sh       | tee install_emsl.log
+${QPACKAGE_ROOT}/scripts/install/install_emsl.sh       | tee ${QPACKAGE_ROOT}/install_logs/install_emsl.log
 
 if [[ ! -d ${QPACKAGE_ROOT}/EMSL_Basis ]]
 then
@@ -73,7 +62,7 @@ fi
 
 echo "${BLUE}===== Installing EZFIO ===== ${BLACK}"
 
-${QPACKAGE_ROOT}/scripts/install/install_ezfio.sh | tee install_ezfio.log
+${QPACKAGE_ROOT}/scripts/install/install_ezfio.sh | tee ${QPACKAGE_ROOT}/install_logs/install_ezfio.log
 if [[ ! -d ${QPACKAGE_ROOT}/EZFIO ]]
 then
   echo $RED "Error in EZFIO installation" $BLACK
@@ -83,7 +72,7 @@ fi
 
 echo "${BLUE}===== Installing Ocaml compiler and libraries ===== ${BLACK}"
 rm -f -- ocaml/Qptypes.ml
-${QPACKAGE_ROOT}/scripts/install/install_ocaml.sh | tee install_ocaml.log
+${QPACKAGE_ROOT}/scripts/install/install_ocaml.sh | tee ${QPACKAGE_ROOT}/install_logs/install_ocaml.log
 
 if [[ ! -f ${QPACKAGE_ROOT}/ocaml/Qptypes.ml ]]
 then
@@ -111,8 +100,7 @@ source ${QPACKAGE_ROOT}/quantum_package.rc
 " $BLACK
 
 
-mkdir -p ${QPACKAGE_ROOT}/install_logs
-mv ${QPACKAGE_ROOT}/*.log ${QPACKAGE_ROOT}/install_logs/
+
 
 if [[ $1 == "--robot" ]] ; 
 then