diff options
Diffstat (limited to 'luarocks/src/luarocks/cfg.lua')
| -rw-r--r-- | luarocks/src/luarocks/cfg.lua | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/luarocks/src/luarocks/cfg.lua b/luarocks/src/luarocks/cfg.lua index 21bb5d0..b7a3cbd 100644 --- a/luarocks/src/luarocks/cfg.lua +++ b/luarocks/src/luarocks/cfg.lua @@ -32,8 +32,8 @@ if not ok then site_config = {} end -cfg.program_version = "scm" -cfg.program_series = "2.2" +cfg.program_version = "2.3.0" +cfg.program_series = "2.3" cfg.major_version = (cfg.program_version:match("([^.]%.[^.])")) or cfg.program_series cfg.variables = {} cfg.rocks_trees = {} @@ -149,7 +149,7 @@ local sys_config_file_default, home_config_file_default local sys_config_dir, home_config_dir local sys_config_ok, home_config_ok = false, false local extra_luarocks_module_dir -sys_config_dir = site_config.LUAROCKS_SYSCONFDIR +sys_config_dir = site_config.LUAROCKS_SYSCONFDIR or site_config.LUAROCKS_PREFIX if cfg.platforms.windows then cfg.home = os.getenv("APPDATA") or "c:" sys_config_dir = sys_config_dir or "c:/luarocks" @@ -664,7 +664,7 @@ function cfg.init_package_paths() end function cfg.which_config() - return { + local ret = { system = { file = sys_config_file or sys_config_file_default, ok = sys_config_ok, @@ -674,6 +674,8 @@ function cfg.which_config() ok = home_config_ok, } } + ret.nearest = (ret.user.ok and ret.user.file) or ret.system.file + return ret end cfg.user_agent = "LuaRocks/"..cfg.program_version.." "..cfg.arch |