diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/cfg.lua | 2 | ||||
| -rw-r--r-- | src/luarocks/fs/win32.lua | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 9b1c5902..d58c7407 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua | |||
| @@ -403,7 +403,7 @@ local defaults = { | |||
| 403 | 403 | ||
| 404 | if cfg.platforms.windows then | 404 | if cfg.platforms.windows then |
| 405 | local full_prefix = (site_config.LUAROCKS_PREFIX or (os.getenv("PROGRAMFILES")..[[\LuaRocks]])) | 405 | local full_prefix = (site_config.LUAROCKS_PREFIX or (os.getenv("PROGRAMFILES")..[[\LuaRocks]])) |
| 406 | extra_luarocks_module_dir = full_prefix.."\\lua\\?.lua" | 406 | extra_luarocks_module_dir = full_prefix.."/lua/?.lua" |
| 407 | 407 | ||
| 408 | home_config_file = home_config_file and home_config_file:gsub("\\","/") | 408 | home_config_file = home_config_file and home_config_file:gsub("\\","/") |
| 409 | defaults.fs_use_modules = false | 409 | defaults.fs_use_modules = false |
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua index 8debaeef..c99cc895 100644 --- a/src/luarocks/fs/win32.lua +++ b/src/luarocks/fs/win32.lua | |||
| @@ -130,6 +130,8 @@ function win32.wrap_script(file, dest, name, version) | |||
| 130 | local wrapname = fs.is_dir(dest) and dest.."/"..base or dest | 130 | local wrapname = fs.is_dir(dest) and dest.."/"..base or dest |
| 131 | wrapname = wrapname..".bat" | 131 | wrapname = wrapname..".bat" |
| 132 | local lpath, lcpath = cfg.package_paths() | 132 | local lpath, lcpath = cfg.package_paths() |
| 133 | lpath = util.remove_path_dupes(lpath, ";") | ||
| 134 | lcpath = util.remove_path_dupes(lcpath, ";") | ||
| 133 | local wrapper = io.open(wrapname, "w") | 135 | local wrapper = io.open(wrapname, "w") |
| 134 | if not wrapper then | 136 | if not wrapper then |
| 135 | return nil, "Could not open "..wrapname.." for writing." | 137 | return nil, "Could not open "..wrapname.." for writing." |
