Skip to content

fix(rockspec): adjusted luarocks executable to contain the appropriate extension on windows #1983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −5
Open

fix(rockspec): adjusted luarocks executable to contain the appropriate extension on windows #1983

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions lua/lazy/pkg/rockspec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,27 @@ M.rewrites = {

M.python = { "python3", "python" }

---@class LuaRocks
M.luarocks = {}

-- check which executable to call for luarocks, considering windows exceptions
-- @return string
function M.luarocks.execname()
local luarocks = "luarocks"
if Util.is_win then
local luarocks_win = "luarocks.exe"
if vim.fn.executable(luarocks_win) == 1 then
luarocks = luarocks_win
else
luarocks_win = "luarocks.bat"
if vim.fn.executable(luarocks_win) == 1 then
luarocks = luarocks_win
end
end
end
return luarocks
end

---@class HereRocks
M.hererocks = {}

Expand Down Expand Up @@ -87,7 +108,8 @@ function M.check(opts)
)
end
else
ok = Health.have("luarocks", opts)
local luarocks = M.luarocks.execname()
ok = Health.have(luarocks, opts)
Health.have(
{ "lua5.1", "lua", "lua-5.1" },
vim.tbl_extend("force", opts, {
Expand Down Expand Up @@ -133,7 +155,7 @@ function M.build(task)
end

local env = {}
local luarocks = "luarocks"
local luarocks = M.luarocks.execname()
if Config.hererocks() then
-- hererocks is still building, so skip for now
-- a new build will happen in the next round
Expand All @@ -151,9 +173,6 @@ function M.build(task)
env = {
PATH = table.concat(path, sep),
}
if Util.is_win then
luarocks = luarocks .. ".bat"
end
end

local pkg = task.plugin._.pkg
Expand Down