diff options
-rw-r--r-- | install.bat | 1 | ||||
-rw-r--r-- | src/luarocks/fs/win32.lua | 2 |
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 | |||
508 | @ECHO OFF | 508 | @ECHO OFF |
509 | SETLOCAL | 509 | SETLOCAL |
510 | SET LUA_PATH=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH% | 510 | SET LUA_PATH=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH% |
511 | IF NOT "%LUA_PATH_5_2%"=="" SET LUA_PATH_5_2=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_2% | ||
511 | SET PATH=$BINDIR\;%PATH% | 512 | SET PATH=$BINDIR\;%PATH% |
512 | "$LUA_INTERPRETER" "$BINDIR\]]..c..[[.lua" %* | 513 | "$LUA_INTERPRETER" "$BINDIR\]]..c..[[.lua" %* |
513 | ENDLOCAL | 514 | 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) | |||
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('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") | ||
74 | wrapper:write('"'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e\'luarocks.loader.add_context([['..name..']],[['..version..']])\' "'..file..'" %*\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() |