From 06f81d93f3e5f33524c0cb0230a4445378801d76 Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Wed, 3 Apr 2019 12:34:51 -0300
Subject: cmd: Fix use of sysconfdir for default-lua-version.lua search
---
src/luarocks/cmd.lua | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua
index d038852b..8a07a92a 100644
--- a/src/luarocks/cmd.lua
+++ b/src/luarocks/cmd.lua
@@ -157,14 +157,14 @@ local function get_lua_version(flags)
return flags["lua-version"]
end
local dirs = {
- cfg.home_tree,
+ dir.path(cfg.home_tree, ".luarocks"),
cfg.sysconfdir,
}
if flags["project-tree"] then
- table.insert(dirs, 1, dir.path(flags["project-tree"], ".."))
+ table.insert(dirs, 1, dir.path(flags["project-tree"], "..", ".luarocks"))
end
for _, d in ipairs(dirs) do
- local f = dir.path(d, ".luarocks", "default-lua-version.lua")
+ local f = dir.path(d, "default-lua-version.lua")
local mod, err = loadfile(f, "t")
if mod then
local pok, ver = pcall(mod)
--
cgit v1.2.3-55-g6feb