diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2018-06-25 12:03:02 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-07-01 15:51:36 -0300 |
| commit | 4e7adb99bf4a8ec72e2c9e0785d1b356ba173d4b (patch) | |
| tree | f7bfc2b112d48461f835d9de200048b0eb679752 /src | |
| parent | 70ea3d3bf74787297507be3d3bd2537993a1153b (diff) | |
| download | luarocks-4e7adb99bf4a8ec72e2c9e0785d1b356ba173d4b.tar.gz luarocks-4e7adb99bf4a8ec72e2c9e0785d1b356ba173d4b.tar.bz2 luarocks-4e7adb99bf4a8ec72e2c9e0785d1b356ba173d4b.zip | |
Windows: support hardcoded.WIN_TOOLS for tool paths
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/core/cfg.lua | 8 |
1 files changed, 8 insertions, 0 deletions
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) | |||
| 679 | end | 679 | end |
| 680 | 680 | ||
| 681 | local defaults = make_defaults(lua_version, processor, platforms, cfg.home) | 681 | local defaults = make_defaults(lua_version, processor, platforms, cfg.home) |
| 682 | |||
| 683 | if platforms.windows and hardcoded.WIN_TOOLS then | ||
| 684 | local tools = { "SEVENZ", "CP", "FIND", "LS", "MD5SUM", "PWD", "RMDIR", "TEST", "WGET" } | ||
| 685 | for _, tool in ipairs(tools) do | ||
| 686 | defaults.variables[tool] = hardcoded.WIN_TOOLS .. "/" .. defaults.variables[tool] .. ".exe" | ||
| 687 | end | ||
| 688 | end | ||
| 689 | |||
| 682 | defaults.rocks_provided, defaults.rocks_provided_3_0 = make_rocks_provided(lua_version, luajit_version) | 690 | defaults.rocks_provided, defaults.rocks_provided_3_0 = make_rocks_provided(lua_version, luajit_version) |
| 683 | use_defaults(cfg, defaults) | 691 | use_defaults(cfg, defaults) |
| 684 | 692 | ||