Use env var to check for GPU support and add this to module path

Author: huebner-m

init/bash

@@ -31,6 +31,10 @@ 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
+    if [[ ! -z "${EESSI_SITE_MODULEPATH}" ]]; then
+      echo "Add ${EESSI_SITE_MODULEPATH} to \$MODULEPATH for GPU support..."
+      module use ${EESSI_SITE_MODULEPATH}
+    fi
 
     #echo >> $output
     #echo "*** Known problems in the ${EESSI_PILOT_VERSION} pilot software stack ***" >> $output

init/eessi_environment_variables

@@ -32,8 +32,9 @@ if [ -d $EESSI_PREFIX ]; then
 
         echo "Using ${EESSI_SOFTWARE_SUBDIR} as software subdirectory." >> $output
         export EESSI_SOFTWARE_PATH=$EESSI_PREFIX/software/$EESSI_OS_TYPE/$EESSI_SOFTWARE_SUBDIR
-        if [ -d "${EESSI_SOFTWARE_PATH/versions/host_injections}" ]; then
-          eessi_gpu_software_path="${EESSI_SOFTWARE_PATH/versions/host_injections}/modules/all"
+        eessi_site_modulepath="${EESSI_SOFTWARE_PATH/versions/host_injections}/modules/all"
+        if [ -d "$eessi_site_modulepath" ]; then
+          export EESSI_SITE_MODULEPATH="$eessi_site_modulepath"
         fi
         if [ ! -z $EESSI_BASIC_ENV ]; then
           echo "Only setting up basic environment, so we're done" >> $output