Skip to content

Commit 74ea9ec

Browse files
committed
Handle .lmod files in dev.eessi.io builds
1 parent d0b5df6 commit 74ea9ec

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

EESSI-install-software.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ export EASYBUILD_INSTALLPATH=${EESSI_PREFIX}/software/${EESSI_OS_TYPE}/${EESSI_S
254254

255255
# If in dev.eessi.io, allow building on top of software.eessi.io via EESSI-extend
256256
if [[ ! -z ${EESSI_DEV_PROJECT} ]]; then
257+
# We keep track of the old install path so the SitePackage.lua and .lmodrc later
258+
EASYBUILD_INSTALLPATH_STANDARD=${EASYBUILD_INSTALLPATH}
257259
# Need to unset $EESSI_CVMFS_INSTALL to use $EESSI_PROJECT_INSTALL
258260
unset EESSI_CVMFS_INSTALL
259261
export EESSI_PROJECT_INSTALL=${EESSI_CVMFS_REPO_OVERRIDE}
@@ -371,7 +373,13 @@ else
371373
done
372374
fi
373375

374-
export LMOD_CONFIG_DIR="${EASYBUILD_INSTALLPATH}/.lmod"
376+
if [[ ! -z ${EESSI_DEV_PROJECT} ]]; then
377+
# Make sure .lmod files are not checked for dev.eeessi.io
378+
export LMOD_CONFIG_DIR="${EASYBUILD_INSTALLPATH_STANDARD}/.lmod"
379+
else
380+
export LMOD_CONFIG_DIR="${EASYBUILD_INSTALLPATH}/.lmod"
381+
fi
382+
375383
lmod_rc_file="$LMOD_CONFIG_DIR/lmodrc.lua"
376384
if [[ ! -z ${EESSI_ACCELERATOR_TARGET} ]]; then
377385
# EESSI_ACCELERATOR_TARGET is set, so let's remove the accelerator path from $lmod_rc_file

0 commit comments

Comments
 (0)