set EESSI_INIT_PREFIX, rename eessi_archdetect_prefix to eessi_init_prefix

Author: bedroge

init/modules/EESSI/2023.06.lua

@@ -15,7 +15,7 @@ local eessi_version = myModuleVersion()
 local eessi_repo = "/cvmfs/software.eessi.io"
 local eessi_prefix = pathJoin(eessi_repo, "versions", eessi_version)
 local eessi_compat_prefix = pathJoin(eessi_prefix, "compat")
-local eessi_archdetect_prefix = pathJoin(eessi_prefix, "init")
+local eessi_init_prefix = pathJoin(eessi_prefix, "init")
 local eessi_os_type = "linux"
 -- for RISC-V clients we need to do some overrides, as things are stored in different CVMFS repositories
 if (subprocess("uname -m"):gsub("\n$","") == "riscv64") then
@@ -53,7 +53,7 @@ function eessiDebug(text)
     end
 end
 function archdetect_cpu()
-    local script = pathJoin(eessi_archdetect_prefix, 'lmod_eessi_archdetect_wrapper.sh')
+    local script = pathJoin(eessi_init_prefix, 'lmod_eessi_archdetect_wrapper.sh')
     -- make sure that we grab the value for architecture before the module unsets the environment variable (in unload mode)
     local archdetect_options = os.getenv("EESSI_ARCHDETECT_OPTIONS") or (os.getenv("EESSI_ARCHDETECT_OPTIONS_OVERRIDE") or "")
     if not os.getenv("EESSI_ARCHDETECT_OPTIONS_OVERRIDE") then
@@ -83,7 +83,7 @@ function archdetect_cpu()
     end
 end
 function archdetect_accel()
-    local script = pathJoin(eessi_archdetect_prefix, 'lmod_eessi_archdetect_wrapper_accel.sh')
+    local script = pathJoin(eessi_init_prefix, 'lmod_eessi_archdetect_wrapper_accel.sh')
     -- for unload mode, we need to grab the value before it is unset
     local archdetect_accel = os.getenv("EESSI_ACCEL_SUBDIR") or (os.getenv("EESSI_ACCELERATOR_TARGET_OVERRIDE") or "")
     if not os.getenv("EESSI_ACCELERATOR_TARGET_OVERRIDE") then
@@ -131,6 +131,8 @@ setenv("EESSI_SOFTWARE_SUBDIR", eessi_software_subdir)
 eessiDebug("Setting EESSI_SOFTWARE_SUBDIR to " .. eessi_software_subdir)
 setenv("EESSI_PREFIX", eessi_prefix)
 eessiDebug("Setting EESSI_PREFIX to " .. eessi_prefix)
+setenv("EESSI_INIT_PREFIX", eessi_init_prefix)
+eessiDebug("Setting EESSI_INIT_PREFIX to " .. eessi_init_prefix)
 setenv("EESSI_EPREFIX", eessi_eprefix)
 eessiDebug("Setting EPREFIX to " .. eessi_eprefix)
 prepend_path("PATH", pathJoin(eessi_eprefix, "bin"))