From eb3cb49800b2a808354b56602776aa76f9cdc020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 14 Jan 2025 17:13:20 +0100 Subject: [PATCH] Update load_eessi_extend_module.sh Co-authored-by: ocaisa --- load_eessi_extend_module.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/load_eessi_extend_module.sh b/load_eessi_extend_module.sh index bd46c3a7eb..b5ad47de4e 100755 --- a/load_eessi_extend_module.sh +++ b/load_eessi_extend_module.sh @@ -88,14 +88,19 @@ else echo ">> Final installation in ${EASYBUILD_INSTALLPATH}..." export PATH=${EB_TMPDIR}/bin:${PATH} export PYTHONPATH=$(ls -d ${EB_TMPDIR}/lib/python*/site-packages):${PYTHONPATH} - eb_install_out=${TMPDIR}/eb_install.out - ok_msg="EESSI-extend/${EESSI_EXTEND_VERSION} installed, let's go!" - fail_msg="Installing EESSI-extend/${EESSI_EXTEND_VERSION} failed, that's not good... (output: ${eb_install_out})" # EESSI-extend also needs EasyBuild to be installed as a module, so install the latest release + eb_install_out=${TMPDIR}/eb_install.out + ok_msg="Latest EasyBuild installed, let's go!" + fail_msg="Installing latest EasyBuild failed, that's not good... (output: ${eb_install_out})" ${EB} --install-latest-eb-release 2>&1 | tee ${eb_install_out} + check_exit_code $? "${ok_msg}" "${fail_msg}" + # Now install EESSI-extend + eessi_install_out=${TMPDIR}/eessi_install.out + ok_msg="EESSI-extend/${EESSI_EXTEND_VERSION} installed, let's go!" + fail_msg="Installing EESSI-extend/${EESSI_EXTEND_VERSION} failed, that's not good... (output: ${eessi_install_out})" # while always adding --try-amend=keep... may do no harm, we could make # an attempt to figure out if it is needed, e.g., when we are rebuilding - ${EB} "EESSI-extend-easybuild.eb" --try-amend=keeppreviousinstall=True 2>&1 | tee ${eb_install_out} + ${EB} "EESSI-extend-easybuild.eb" --try-amend=keeppreviousinstall=True 2>&1 | tee ${eessi_install_out} check_exit_code $? "${ok_msg}" "${fail_msg}" )