Lua 5.2 paths in wrapper scripts on windows

2 files changed, 3 insertions, 0 deletions

diff --git a/install.bat b/install.bat
index 99dc7fa7..46ad2b99 100644
--- a/install.bat
+++ b/install.bat
@@ -508,6 +508,7 @@ for _, c in ipairs{"luarocks", "luarocks-admin"} do
 @ECHO OFF

 SETLOCAL

 SET LUA_PATH=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH%

+IF NOT "%LUA_PATH_5_2%"=="" SET LUA_PATH_5_2=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_2%

 SET PATH=$BINDIR\;%PATH%

 "$LUA_INTERPRETER" "$BINDIR\]]..c..[[.lua" %*

 ENDLOCAL

diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index 2b5bb955..c6347b9f 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -71,6 +71,8 @@ function wrap_script(file, dest, name, version)
    wrapper:write("setlocal\n")
    wrapper:write('set LUA_PATH='..package.path..";%LUA_PATH%\n")
    wrapper:write('set LUA_CPATH='..package.cpath..";%LUA_CPATH%\n")
+   wrapper:write('if not "%LUA_PATH_5_2%"=="" set LUA_PATH_5_2='..package.path..";%LUA_PATH_5_2%\n")
+   wrapper:write('if not "%LUA_CPATH_5_2%"=="" set LUA_CPATH_5_2='..package.cpath..";%LUA_CPATH_5_2%\n")
    wrapper:write('"'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e\'luarocks.loader.add_context([['..name..']],[['..version..']])\' "'..file..'" %*\n')
    wrapper:write("endlocal\n")
    wrapper:close()