From d9af1cf4bb17269d0120af66829d87b68ee03246 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Tue, 11 Sep 2018 15:53:52 -0400 Subject: fs.win32: fix wrapper generation when a folder with the same basename exists Fixes #908. --- src/luarocks/fs/win32.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua index bb15ed28..f76f5f6e 100644 --- a/src/luarocks/fs/win32.lua +++ b/src/luarocks/fs/win32.lua @@ -139,8 +139,8 @@ function win32.wrap_script(file, dest, deps_mode, name, version, ...) assert(type(name) == "string" or not name) assert(type(version) == "string" or not version) - local wrapname = fs.is_dir(dest) and dest.."/"..dir.base_name(file) or dest - wrapname = wrapname .. ".bat" + local batname = (file or dest) .. ".bat" + local wrapname = fs.is_dir(dest) and dest.."/"..batname or batname local wrapper = io.open(wrapname, "w") if not wrapper then return nil, "Could not open "..wrapname.." for writing." -- cgit v1.2.3-55-g6feb