Issue TACC#648: force default .modulepath point to the one in @pkg@/init

surak · May 18, 2023 · b9b7d9b · b9b7d9b
1 parent a556a16
commit b9b7d9b
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/myGlobals.lua b/src/myGlobals.lua
@@ -76,19 +76,23 @@ setenv_posix("LC_ALL","C",true)
 --                       MODULEPATH in the startup scripts
 ------------------------------------------------------------------------
 local mpath_init = getenv("LMOD_MODULEPATH_INIT")
+local default_mpath_init = "@PKG@/init/.modulespath"
+local global_mpath_init  = "/etc/lmod/.modulespath"
 if (not mpath_init) then
-   local default_mpath_init = "/etc/lmod/.modulespath"
-   if (access(default_mpath_init, "r")) then
-      mpath_init = default_mpath_init
+   if (access(global_mpath_init, "r")) then
+      mpath_init = global_mpath_init
    else
       mpath_init = "@modulepath_init@"
+      if (mpath_init:sub(1,1) == "@") then
+         mpath_init = default_mpath_init
+      end
    end
+
 end
 
-
 cosmic:init{name    = "LMOD_MODULEPATH_INIT",
             sedV    = "@modulepath_init@",
-            default = "@PKG@/init/.modulespath",
+            default = default_mpath_init,
             assignV = mpath_init}
 
 ------------------------------------------------------------------------