From c3caaecfa06467200dbd42e079baf8b468a49e6a Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Wed, 16 Feb 2022 18:31:44 -0300 Subject: win32: do not use "pwd" on windows, use "echo %cd%" --- src/luarocks/core/cfg.lua | 3 ++- win32/COPYING | 2 +- win32/tools/pwd.exe | Bin 61440 -> 0 bytes 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 win32/tools/pwd.exe diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua index 58ed1ac6..fca315e0 100644 --- a/src/luarocks/core/cfg.lua +++ b/src/luarocks/core/cfg.lua @@ -285,6 +285,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home) defaults.external_deps_dirs = { "c:/external/", "c:/windows/system32" } defaults.makefile = "Makefile.win" + defaults.variables.PWD = "echo %cd%" defaults.variables.MAKE = "nmake" defaults.variables.CC = "cl" defaults.variables.RC = "rc" @@ -762,7 +763,7 @@ function cfg.init(detected, warning) local defaults = make_defaults(cfg.lua_version, processor, platforms, cfg.home) if platforms.windows and hardcoded.WIN_TOOLS then - local tools = { "SEVENZ", "CP", "FIND", "LS", "MD5SUM", "PWD", "WGET", } + local tools = { "SEVENZ", "CP", "FIND", "LS", "MD5SUM", "WGET", } for _, tool in ipairs(tools) do defaults.variables[tool] = '"' .. hardcoded.WIN_TOOLS .. "/" .. defaults.variables[tool] .. '.exe"' end diff --git a/win32/COPYING b/win32/COPYING index 7fd84ab1..b5bed84d 100644 --- a/win32/COPYING +++ b/win32/COPYING @@ -4,7 +4,7 @@ following licenses: * For 7z.exe and 7z.dll, please see COPYING_7z for details. -* find.exe, mv.exe, wget.exe, ls.exe, pwd.exe, md5sum.exe, +* find.exe, mv.exe, wget.exe, ls.exe, md5sum.exe, cp.exe, and uname.exe are part of UnxUtils, check http://unxutils.sourceforge.net/ for license information. diff --git a/win32/tools/pwd.exe b/win32/tools/pwd.exe deleted file mode 100644 index 7dd114de..00000000 Binary files a/win32/tools/pwd.exe and /dev/null differ -- cgit v1.2.3-55-g6feb