From 24b4e1b7ca8ab87456c415cac6ef13ba051b5cdb Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Thu, 30 Apr 2015 14:00:43 +0200 Subject: [PATCH] Move install script into install --- scripts/{ => install}/install_curl.sh | 0 scripts/{ => install}/install_emsl.sh | 0 scripts/{ => install}/install_ezfio.sh | 0 scripts/{ => install}/install_irpf90.sh | 0 scripts/{ => install}/install_m4.sh | 0 scripts/{ => install}/install_ocaml.sh | 0 scripts/{ => install}/install_resultsFile.sh | 0 scripts/{ => install}/install_zlib.sh | 0 scripts/upgrade_ezfio.sh | 2 +- scripts/upgrade_irpf90.sh | 2 +- setup_environment.sh | 16 ++++++++-------- 11 files changed, 10 insertions(+), 10 deletions(-) rename scripts/{ => install}/install_curl.sh (100%) rename scripts/{ => install}/install_emsl.sh (100%) rename scripts/{ => install}/install_ezfio.sh (100%) rename scripts/{ => install}/install_irpf90.sh (100%) rename scripts/{ => install}/install_m4.sh (100%) rename scripts/{ => install}/install_ocaml.sh (100%) rename scripts/{ => install}/install_resultsFile.sh (100%) rename scripts/{ => install}/install_zlib.sh (100%) diff --git a/scripts/install_curl.sh b/scripts/install/install_curl.sh similarity index 100% rename from scripts/install_curl.sh rename to scripts/install/install_curl.sh diff --git a/scripts/install_emsl.sh b/scripts/install/install_emsl.sh similarity index 100% rename from scripts/install_emsl.sh rename to scripts/install/install_emsl.sh diff --git a/scripts/install_ezfio.sh b/scripts/install/install_ezfio.sh similarity index 100% rename from scripts/install_ezfio.sh rename to scripts/install/install_ezfio.sh diff --git a/scripts/install_irpf90.sh b/scripts/install/install_irpf90.sh similarity index 100% rename from scripts/install_irpf90.sh rename to scripts/install/install_irpf90.sh diff --git a/scripts/install_m4.sh b/scripts/install/install_m4.sh similarity index 100% rename from scripts/install_m4.sh rename to scripts/install/install_m4.sh diff --git a/scripts/install_ocaml.sh b/scripts/install/install_ocaml.sh similarity index 100% rename from scripts/install_ocaml.sh rename to scripts/install/install_ocaml.sh diff --git a/scripts/install_resultsFile.sh b/scripts/install/install_resultsFile.sh similarity index 100% rename from scripts/install_resultsFile.sh rename to scripts/install/install_resultsFile.sh diff --git a/scripts/install_zlib.sh b/scripts/install/install_zlib.sh similarity index 100% rename from scripts/install_zlib.sh rename to scripts/install/install_zlib.sh diff --git a/scripts/upgrade_ezfio.sh b/scripts/upgrade_ezfio.sh index 4a9af403..c35a2dbd 100755 --- a/scripts/upgrade_ezfio.sh +++ b/scripts/upgrade_ezfio.sh @@ -12,7 +12,7 @@ fi cd -- ${QPACKAGE_ROOT} mv -- ${QPACKAGE_ROOT}/EZFIO ${QPACKAGE_ROOT}/EZFIO.old -${QPACKAGE_ROOT}/scripts/install_ezfio.sh +${QPACKAGE_ROOT}/scripts/install/install_ezfio.sh if [[ $? -eq 0 ]] then diff --git a/scripts/upgrade_irpf90.sh b/scripts/upgrade_irpf90.sh index 5735754f..dea48014 100755 --- a/scripts/upgrade_irpf90.sh +++ b/scripts/upgrade_irpf90.sh @@ -12,7 +12,7 @@ fi cd -- ${QPACKAGE_ROOT} mv -f -- ${QPACKAGE_ROOT}/irpf90 ${QPACKAGE_ROOT}/irpf90.old -${QPACKAGE_ROOT}/scripts/install_irpf90.sh +${QPACKAGE_ROOT}/scripts/install/install_irpf90.sh if [[ $? -eq 0 ]] then diff --git a/setup_environment.sh b/setup_environment.sh index 12fcf4a5..72d2834c 100755 --- a/setup_environment.sh +++ b/setup_environment.sh @@ -30,7 +30,7 @@ EOF source quantum_package.rc echo "${BLUE}===== Installing IRPF90 ===== ${BLACK}" -${QPACKAGE_ROOT}/scripts/install_irpf90.sh | tee install_irpf90.log +${QPACKAGE_ROOT}/scripts/install/install_irpf90.sh | tee install_irpf90.log if [[ ! -d ${QPACKAGE_ROOT}/irpf90 ]] then echo $RED "Error in IRPF90 installation" $BLACK @@ -51,16 +51,16 @@ fi echo "${BLUE}===== Installing Zlib ===== ${BLACK}" -${QPACKAGE_ROOT}/scripts/install_zlib.sh | tee install_zlib.log +${QPACKAGE_ROOT}/scripts/install/install_zlib.sh | tee install_zlib.log echo "${BLUE}===== Installing Curl ===== ${BLACK}" -${QPACKAGE_ROOT}/scripts/install_curl.sh | tee install_curl.log +${QPACKAGE_ROOT}/scripts/install/install_curl.sh | tee install_curl.log echo "${BLUE}===== Installing M4 ===== ${BLACK}" -${QPACKAGE_ROOT}/scripts/install_m4.sh | tee install_m4.log +${QPACKAGE_ROOT}/scripts/install/install_m4.sh | tee install_m4.log echo "${BLUE}===== Installing EMSL Basis set library ===== ${BLACK}" -${QPACKAGE_ROOT}/scripts/install_emsl.sh | tee install_emsl.log +${QPACKAGE_ROOT}/scripts/install/install_emsl.sh | tee install_emsl.log if [[ ! -d ${QPACKAGE_ROOT}/EMSL_Basis ]] then @@ -70,7 +70,7 @@ fi echo "${BLUE}===== Installing EZFIO ===== ${BLACK}" -${QPACKAGE_ROOT}/scripts/install_ezfio.sh | tee install_ezfio.log +${QPACKAGE_ROOT}/scripts/install/install_ezfio.sh | tee install_ezfio.log if [[ ! -d ${QPACKAGE_ROOT}/EZFIO ]] then echo $RED "Error in EZFIO installation" $BLACK @@ -80,7 +80,7 @@ fi echo "${BLUE}===== Installing Ocaml compiler and libraries ===== ${BLACK}" rm -f -- ocaml/Qptypes.ml -${QPACKAGE_ROOT}/scripts/install_ocaml.sh | tee install_ocaml.log +${QPACKAGE_ROOT}/scripts/install/install_ocaml.sh | tee install_ocaml.log if [[ ! -f ${QPACKAGE_ROOT}/ocaml/Qptypes.ml ]] then @@ -89,7 +89,7 @@ then fi echo "${BLUE}===== Installing resultsFile Python library ===== ${BLACK}" -${QPACKAGE_ROOT}/scripts/install_resultsFile.sh +${QPACKAGE_ROOT}/scripts/install/install_resultsFile.sh if [[ ! -d ${QPACKAGE_ROOT}/resultsFile ]] then echo $RED "Error in resultsFile installation" $BLACK