diff options
| author | Thijs Schreijer <thijs@thijsschreijer.nl> | 2013-10-09 23:55:06 -0700 |
|---|---|---|
| committer | Thijs Schreijer <thijs@thijsschreijer.nl> | 2013-10-09 23:55:06 -0700 |
| commit | 68878f0fdde4749be50eeb141631eafa5b7aa8e3 (patch) | |
| tree | d8a15f49e04e92b5bcb7d417a7e6ccdae70583ca /src | |
| parent | ff7c4d70fb15c7ed569aee0e980661638d41637f (diff) | |
| parent | 8c675a194ed8b038dcf3678d995aa87899282692 (diff) | |
| download | luarocks-68878f0fdde4749be50eeb141631eafa5b7aa8e3.tar.gz luarocks-68878f0fdde4749be50eeb141631eafa5b7aa8e3.tar.bz2 luarocks-68878f0fdde4749be50eeb141631eafa5b7aa8e3.zip | |
Merge pull request #164 from Tieske/interpreter_short_version
fix paths for 5.2, escaping in installer and fix wrapper scripts
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/fs/win32.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua index 2b5bb955..2bc595f6 100644 --- a/src/luarocks/fs/win32.lua +++ b/src/luarocks/fs/win32.lua | |||
| @@ -71,7 +71,9 @@ function wrap_script(file, dest, name, version) | |||
| 71 | wrapper:write("setlocal\n") | 71 | wrapper:write("setlocal\n") |
| 72 | wrapper:write('set LUA_PATH='..package.path..";%LUA_PATH%\n") | 72 | wrapper:write('set LUA_PATH='..package.path..";%LUA_PATH%\n") |
| 73 | wrapper:write('set LUA_CPATH='..package.cpath..";%LUA_CPATH%\n") | 73 | wrapper:write('set LUA_CPATH='..package.cpath..";%LUA_CPATH%\n") |
| 74 | wrapper:write('"'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e\'luarocks.loader.add_context([['..name..']],[['..version..']])\' "'..file..'" %*\n') | 74 | wrapper:write('if not "%LUA_PATH_5_2%"=="" set LUA_PATH_5_2='..package.path..";%LUA_PATH_5_2%\n") |
| 75 | wrapper:write('if not "%LUA_CPATH_5_2%"=="" set LUA_CPATH_5_2='..package.cpath..";%LUA_CPATH_5_2%\n") | ||
| 76 | wrapper:write('"'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e"luarocks.loader.add_context([['..name..']],[['..version..']])" "'..file..'" %*\n') | ||
| 75 | wrapper:write("endlocal\n") | 77 | wrapper:write("endlocal\n") |
| 76 | wrapper:close() | 78 | wrapper:close() |
| 77 | return true | 79 | return true |