Skip to content

Commit db90ca7

Browse files
committed
adjust path to lua files if building accelerator software
1 parent c3482b2 commit db90ca7

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

EESSI-install-software.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,11 @@ fi
330330

331331
export LMOD_CONFIG_DIR="${EASYBUILD_INSTALLPATH}/.lmod"
332332
lmod_rc_file="$LMOD_CONFIG_DIR/lmodrc.lua"
333+
if [[ ! -z ${EESSI_ACCELERATOR_TARGET} ]]; then
334+
# EESSI_ACCELERATOR_TARGET is set, so let's remove the accelerator path from $lmod_rc_file
335+
lmod_rc_file=$(echo ${lmod_rc_file} | sed "s@/accel/${EESSI_ACCELERATOR_TARGET}@@")
336+
echo "Path to lmodrc.lua changed to '${lmod_rc_file}'"
337+
fi
333338
lmodrc_changed=$(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^create_lmodrc.py$' > /dev/null; echo $?)
334339
if [ ! -f $lmod_rc_file ] || [ ${lmodrc_changed} == '0' ]; then
335340
echo ">> Creating/updating Lmod RC file (${lmod_rc_file})..."
@@ -339,6 +344,11 @@ fi
339344

340345
export LMOD_PACKAGE_PATH="${EASYBUILD_INSTALLPATH}/.lmod"
341346
lmod_sitepackage_file="$LMOD_PACKAGE_PATH/SitePackage.lua"
347+
if [[ ! -z ${EESSI_ACCELERATOR_TARGET} ]]; then
348+
# EESSI_ACCELERATOR_TARGET is set, so let's remove the accelerator path from $lmod_sitepackage_file
349+
lmod_sitepackage_file=$(echo ${lmod_sitepackage_file} | sed "s@/accel/${EESSI_ACCELERATOR_TARGET}@@")
350+
echo "Path to SitePackage.lua changed to '${lmod_sitepackage_file}'"
351+
fi
342352
sitepackage_changed=$(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^create_lmodsitepackage.py$' > /dev/null; echo $?)
343353
if [ ! -f "$lmod_sitepackage_file" ] || [ "${sitepackage_changed}" == '0' ]; then
344354
echo ">> Creating/updating Lmod SitePackage.lua (${lmod_sitepackage_file})..."

0 commit comments

Comments
 (0)