diff options
-rw-r--r-- | install.bat | 2 | ||||
-rw-r--r-- | src/luarocks/core/cfg.lua | 2 | ||||
-rw-r--r-- | win32/COPYING | 4 | ||||
-rw-r--r-- | win32/tools/mkdir.exe | bin | 32768 -> 0 bytes | |||
-rw-r--r-- | win32/tools/rmdir.exe | bin | 25088 -> 0 bytes |
5 files changed, 4 insertions, 4 deletions
diff --git a/install.bat b/install.bat index 0100ca63..7a5df9cd 100644 --- a/install.bat +++ b/install.bat | |||
@@ -80,7 +80,7 @@ local function exists(filename) | |||
80 | end | 80 | end |
81 | 81 | ||
82 | local function mkdir (dir) | 82 | local function mkdir (dir) |
83 | return exec([[.\win32\tools\mkdir -p "]]..dir..[[" >NUL]]) | 83 | return exec([[MKDIR "]]..dir..[[" >NUL]]) |
84 | end | 84 | end |
85 | 85 | ||
86 | -- does the current user have admin privileges ( = elevated) | 86 | -- does the current user have admin privileges ( = elevated) |
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua index 9059098a..58ed1ac6 100644 --- a/src/luarocks/core/cfg.lua +++ b/src/luarocks/core/cfg.lua | |||
@@ -762,7 +762,7 @@ function cfg.init(detected, warning) | |||
762 | local defaults = make_defaults(cfg.lua_version, processor, platforms, cfg.home) | 762 | local defaults = make_defaults(cfg.lua_version, processor, platforms, cfg.home) |
763 | 763 | ||
764 | if platforms.windows and hardcoded.WIN_TOOLS then | 764 | if platforms.windows and hardcoded.WIN_TOOLS then |
765 | local tools = { "SEVENZ", "CP", "FIND", "LS", "MD5SUM", "PWD", "RMDIR", "WGET", "MKDIR" } | 765 | local tools = { "SEVENZ", "CP", "FIND", "LS", "MD5SUM", "PWD", "WGET", } |
766 | for _, tool in ipairs(tools) do | 766 | for _, tool in ipairs(tools) do |
767 | defaults.variables[tool] = '"' .. hardcoded.WIN_TOOLS .. "/" .. defaults.variables[tool] .. '.exe"' | 767 | defaults.variables[tool] = '"' .. hardcoded.WIN_TOOLS .. "/" .. defaults.variables[tool] .. '.exe"' |
768 | end | 768 | end |
diff --git a/win32/COPYING b/win32/COPYING index d28b2efd..7fd84ab1 100644 --- a/win32/COPYING +++ b/win32/COPYING | |||
@@ -4,8 +4,8 @@ following licenses: | |||
4 | 4 | ||
5 | * For 7z.exe and 7z.dll, please see COPYING_7z for details. | 5 | * For 7z.exe and 7z.dll, please see COPYING_7z for details. |
6 | 6 | ||
7 | * find.exe, mv.exe, wget.exe, ls.exe, pwd.exe, rmdir.exe, md5sum.exe, | 7 | * find.exe, mv.exe, wget.exe, ls.exe, pwd.exe, md5sum.exe, |
8 | cp.exe, mkdir.exe, and uname.exe are part of UnxUtils, check | 8 | cp.exe, and uname.exe are part of UnxUtils, check |
9 | http://unxutils.sourceforge.net/ for license information. | 9 | http://unxutils.sourceforge.net/ for license information. |
10 | 10 | ||
11 | * Files under win32/lua5.1, except for Microsoft.VC80.CRT.manifest and msv*.*, | 11 | * Files under win32/lua5.1, except for Microsoft.VC80.CRT.manifest and msv*.*, |
diff --git a/win32/tools/mkdir.exe b/win32/tools/mkdir.exe deleted file mode 100644 index 83e57d97..00000000 --- a/win32/tools/mkdir.exe +++ /dev/null | |||
Binary files differ | |||
diff --git a/win32/tools/rmdir.exe b/win32/tools/rmdir.exe deleted file mode 100644 index 6a85c3c4..00000000 --- a/win32/tools/rmdir.exe +++ /dev/null | |||
Binary files differ | |||