Add extension of EESSI to MODULEPATH

EESSI · Oct 20, 2023 · f1a0e71 · f1a0e71
1 parent 9166400
commit f1a0e71
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/init/Magic_Castle/bash b/init/Magic_Castle/bash
@@ -10,7 +10,7 @@ source $(dirname "$BASH_SOURCE")/../eessi_environment_variables
 
 # Provide a clean MODULEPATH
 export MODULEPATH_ROOT=$EESSI_MODULEPATH
-export MODULEPATH=$EESSI_MODULEPATH
+export MODULEPATH=$EESSI_EXTEND_MODULEPATH:$EESSI_MODULEPATH
 
 # Extensions are too many, let's not print them by default (requires Lmod 8.4.12)
 export LMOD_AVAIL_EXTENSIONS=no

diff --git a/init/bash b/init/bash
@@ -26,6 +26,8 @@ if [ $? -eq 0 ]; then
     # prepend location of modules for EESSI software stack to $MODULEPATH
     echo "Prepending $EESSI_MODULEPATH to \$MODULEPATH..." >> $output
     module use $EESSI_MODULEPATH
+    echo "Prepending $EESSI_EXTEND_MODULEPATH to \$MODULEPATH..." >> $output
+    module use $EESSI_EXTEND_MODULEPATH
 
     #echo >> $output
     #echo "*** Known problems in the ${EESSI_PILOT_VERSION} pilot software stack ***" >> $output

diff --git a/init/eessi_environment_variables b/init/eessi_environment_variables
@@ -60,6 +60,8 @@ if [ -d $EESSI_PREFIX ]; then
           if [ -d $EESSI_MODULEPATH ]; then
             export EESSI_MODULEPATH=$EESSI_MODULEPATH
             echo "Using ${EESSI_MODULEPATH} as the directory to be added to MODULEPATH." >> $output
+            export EESSI_EXTEND_MODULEPATH=${EESSI_MODULEPATH/versions/host_injections}
+            echo "Using ${EESSI_EXTEND_MODULEPATH} as the extension directory to be added to MODULEPATH." >> $output
           else
             error "EESSI module path at $EESSI_MODULEPATH not found!"
             false