Merge pull request #385 from Tieske/master

Read os variables from config files

1 files changed, 17 insertions, 9 deletions

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index a02caaee..48623765 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -145,13 +145,28 @@ end
 cfg.variables = {}
 cfg.rocks_trees = {}
 
+-- The global environment in the config files;
+local env_for_config_file
+env_for_config_file = {
+   home = cfg.home,
+   lua_version = cfg.lua_version,
+   platform = util.make_shallow_copy(detected),
+   processor = proc,
+   os_getenv = os.getenv, 
+   dump_env = function()
+     -- debug function, calling it from a config file will show all 
+     -- available globals to that config file
+     print(util.show_table(env_for_config_file, "global environment"))
+   end,
+}
+
 sys_config_file = site_config.LUAROCKS_SYSCONFIG or sys_config_dir.."/config-"..cfg.lua_version..".lua"
 do
    local err, errcode
-   sys_config_ok, err, errcode = persist.load_into_table(sys_config_file, cfg)
+   sys_config_ok, err, errcode = persist.load_into_table(sys_config_file, env_for_config_file)
    if (not sys_config_ok) and errcode == "open" then -- file not found, so try alternate file
       sys_config_file = sys_config_dir.."/config.lua"
-      sys_config_ok, err, errcode = persist.load_into_table(sys_config_file, cfg)
+      sys_config_ok, err, errcode = persist.load_into_table(sys_config_file, env_for_config_file)
    end
    if (not sys_config_ok) and errcode ~= "open" then -- either "load" or "run"; bad config file, bail out with error
       io.stderr:write(err.."\n")
@@ -159,13 +174,6 @@ do
    end
 end
 
-local env_for_config_file = {
-   home = cfg.home,
-   lua_version = cfg.lua_version,
-   platform = util.make_shallow_copy(detected),
-   processor = proc,
-}
-
 if not site_config.LUAROCKS_FORCE_CONFIG then
 
    local home_overrides, err, errcode