From c1c3285ceca0bd0192ade4710c157cb7d31735d2 Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Mon, 27 Apr 2015 17:10:25 +0200 Subject: [PATCH] Move install script into install folder --- scripts/{ => install}/install_curl.sh | 4 ++-- scripts/{ => install}/install_docopt.sh | 4 ++-- scripts/{ => install}/install_emsl.sh | 4 ++-- scripts/{ => install}/install_ezfio.sh | 4 ++-- 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 | 18 +++++++++--------- 12 files changed, 19 insertions(+), 19 deletions(-) rename scripts/{ => install}/install_curl.sh (83%) rename scripts/{ => install}/install_docopt.sh (70%) rename scripts/{ => install}/install_emsl.sh (79%) rename scripts/{ => install}/install_ezfio.sh (77%) 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 83% rename from scripts/install_curl.sh rename to scripts/install/install_curl.sh index 20033f77..b2e47481 100755 --- a/scripts/install_curl.sh +++ b/scripts/install/install_curl.sh @@ -8,8 +8,8 @@ CURL_URL="http://qmcchem.ups-tlse.fr/files/scemama/${CURL}.tar.bz2" if [[ -z ${QPACKAGE_ROOT} ]] then - print "The QPACKAGE_ROOT environment variable is not set." - print "Please reload the quantum_package.rc file." + echo "The QPACKAGE_ROOT environment variable is not set." + echo "Please reload the quantum_package.rc file." exit -1 fi diff --git a/scripts/install_docopt.sh b/scripts/install/install_docopt.sh similarity index 70% rename from scripts/install_docopt.sh rename to scripts/install/install_docopt.sh index 7edf2377..6f799c47 100755 --- a/scripts/install_docopt.sh +++ b/scripts/install/install_docopt.sh @@ -8,8 +8,8 @@ DOCOPT_URL="https://raw.githubusercontent.com/docopt/docopt/master/${DOCOPT}" if [[ -z ${QPACKAGE_ROOT} ]] then - print "The QPACKAGE_ROOT environment variable is not set." - print "Please reload the quantum_package.rc file." + echo "The QPACKAGE_ROOT environment variable is not set." + echo "Please reload the quantum_package.rc file." exit -1 fi diff --git a/scripts/install_emsl.sh b/scripts/install/install_emsl.sh similarity index 79% rename from scripts/install_emsl.sh rename to scripts/install/install_emsl.sh index dff002a1..b01afb6e 100755 --- a/scripts/install_emsl.sh +++ b/scripts/install/install_emsl.sh @@ -8,8 +8,8 @@ URL="https://github.com/LCPQ/${BASE}/archive/master.tar.gz" if [[ -z ${QPACKAGE_ROOT} ]] then - print "The QPACKAGE_ROOT environment variable is not set." - print "Please reload the quantum_package.rc file." + echo "The QPACKAGE_ROOT environment variable is not set." + echo "Please reload the quantum_package.rc file." exit -1 fi diff --git a/scripts/install_ezfio.sh b/scripts/install/install_ezfio.sh similarity index 77% rename from scripts/install_ezfio.sh rename to scripts/install/install_ezfio.sh index 0f7a6505..c0033ca8 100755 --- a/scripts/install_ezfio.sh +++ b/scripts/install/install_ezfio.sh @@ -8,8 +8,8 @@ URL="https://github.com/LCPQ/${BASE}/archive/master.tar.gz" if [[ -z ${QPACKAGE_ROOT} ]] then - print "The QPACKAGE_ROOT environment variable is not set." - print "Please reload the quantum_package.rc file." + echo "The QPACKAGE_ROOT environment variable is not set." + echo "Please reload the quantum_package.rc file." exit -1 fi 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 e650a273..cc6dd570 100755 --- a/setup_environment.sh +++ b/setup_environment.sh @@ -28,7 +28,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 @@ -49,19 +49,19 @@ 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 Docopt ===== ${BLACK}" -${QPACKAGE_ROOT}/scripts/install_docopt.sh | tee install_docopt.log +${QPACKAGE_ROOT}/scripts/install/install_docopt.sh | tee install_docopt.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 @@ -71,7 +71,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 @@ -81,7 +81,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 @@ -90,7 +90,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