From 4e7adb99bf4a8ec72e2c9e0785d1b356ba173d4b Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Mon, 25 Jun 2018 12:03:02 -0300 Subject: Windows: support hardcoded.WIN_TOOLS for tool paths --- src/luarocks/core/cfg.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua index 297c98bb..5d538d68 100644 --- a/src/luarocks/core/cfg.lua +++ b/src/luarocks/core/cfg.lua @@ -679,6 +679,14 @@ function cfg.init(lua_data, project_dir, warning) end local defaults = make_defaults(lua_version, processor, platforms, cfg.home) + + if platforms.windows and hardcoded.WIN_TOOLS then + local tools = { "SEVENZ", "CP", "FIND", "LS", "MD5SUM", "PWD", "RMDIR", "TEST", "WGET" } + for _, tool in ipairs(tools) do + defaults.variables[tool] = hardcoded.WIN_TOOLS .. "/" .. defaults.variables[tool] .. ".exe" + end + end + defaults.rocks_provided, defaults.rocks_provided_3_0 = make_rocks_provided(lua_version, luajit_version) use_defaults(cfg, defaults) -- cgit v1.2.3-55-g6feb