aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/luarocks/cfg.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index f5d7fb5e..31b3211a 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -216,10 +216,10 @@ end
216 216
217-- Load system configuration file 217-- Load system configuration file
218do 218do
219 sys_config_file_default = sys_config_dir.."/config.lua" 219 sys_config_file_default = sys_config_dir.."/config-"..cfg.lua_version..".lua"
220 sys_config_file = load_config_file({ 220 sys_config_file = load_config_file({
221 site_config.LUAROCKS_SYSCONFIG or sys_config_dir.."/config-"..cfg.lua_version..".lua", 221 site_config.LUAROCKS_SYSCONFIG or sys_config_file_default,
222 sys_config_file_default, 222 sys_config_dir.."/config.lua",
223 }) 223 })
224 sys_config_ok = (sys_config_file ~= nil) 224 sys_config_ok = (sys_config_file ~= nil)
225end 225end
@@ -227,11 +227,11 @@ end
227-- Load user configuration file (if allowed) 227-- Load user configuration file (if allowed)
228if not site_config.LUAROCKS_FORCE_CONFIG then 228if not site_config.LUAROCKS_FORCE_CONFIG then
229 229
230 home_config_file_default = home_config_dir.."/config.lua" 230 home_config_file_default = home_config_dir.."/config-"..cfg.lua_version..".lua"
231 local list = { 231 local list = {
232 os.getenv("LUAROCKS_CONFIG_" .. version_suffix) or os.getenv("LUAROCKS_CONFIG"), 232 os.getenv("LUAROCKS_CONFIG_" .. version_suffix) or os.getenv("LUAROCKS_CONFIG"),
233 home_config_dir.."/config-"..cfg.lua_version..".lua",
234 home_config_file_default, 233 home_config_file_default,
234 home_config_dir.."/config.lua",
235 } 235 }
236 -- first entry might be a silent nil, check and remove if so 236 -- first entry might be a silent nil, check and remove if so
237 if not list[1] then table.remove(list, 1) end 237 if not list[1] then table.remove(list, 1) end