diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh index 9524ef7f77..b93315336a 100755 --- a/EESSI-install-software.sh +++ b/EESSI-install-software.sh @@ -207,6 +207,7 @@ export PYTHONPYCACHEPREFIX=$TMPDIR/pycache # - .lmod/lmodrc.lua # - .lmod/SitePackage.lua _eessi_software_path=${EESSI_PREFIX}/software/${EESSI_OS_TYPE}/${EESSI_SOFTWARE_SUBDIR_OVERRIDE} +echo "_eessi_software_path: ${_eessi_software_path}" _lmod_cfg_dir=${_eessi_software_path}/.lmod _lmod_rc_file=${_lmod_cfg_dir}/lmodrc.lua if [ ! -f ${_lmod_rc_file} ]; then @@ -297,10 +298,12 @@ fi # If in dev.eessi.io, allow building on top of software.eessi.io if [[ "${EESSI_CVMFS_REPO}" == /cvmfs/dev.eessi.io ]]; then module use /cvmfs/software.eessi.io/versions/$EESSI_VERSION/software/${EESSI_OS_TYPE}/${EESSI_SOFTWARE_SUBDIR_OVERRIDE}/modules/all + # Overwrite EASYBUILD_INSTALLPATH to point to dev.eessi.io + EASYBUILD_INSTALLPATH=$EESSI_CVMFS_REPO_OVERRIDE/versions/$EESSI_VERSION/$EESSI_DEV_PROJECT/ +else + module use $EASYBUILD_INSTALLPATH/modules/all fi -module use $EASYBUILD_INSTALLPATH/modules/all - if [[ -z ${MODULEPATH} ]]; then fatal_error "Failed to set up \$MODULEPATH?!" else diff --git a/init/minimal_eessi_env b/init/minimal_eessi_env index 9861d1e3c9..abfda6d15a 100644 --- a/init/minimal_eessi_env +++ b/init/minimal_eessi_env @@ -14,7 +14,7 @@ echo "EESSI_DEV_PROJECT: ${EESSI_DEV_PROJECT}" if [ -z ${EESSI_DEV_PROJECT} ]; then export EESSI_PREFIX=$EESSI_CVMFS_REPO/versions/$EESSI_VERSION/ else - export EESSI_PREFIX=$EESSI_CVMFS_REPO/versions/$EESSI_VERSION/$EESSI_DEV_PROJECT/ + export EESSI_PREFIX=$EESSI_CVMFS_REPO_OVERRIDE/versions/$EESSI_VERSION/$EESSI_DEV_PROJECT/ # Set EESSI_PREFIX to the dev project path for EESSI-extend export EESSI_CVMFS_INSTALL=$EESSI_PREFIX fi