Merge branch 'master' of github.com:keplerproject/luarocks

2 files changed, 6 insertions, 4 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)
    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('"'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e\'luarocks.loader.add_context([['..name..']],[['..version..']])\' "'..file..'" %*\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()
    return true
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index b8f9bd36..2e125923 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -229,7 +229,7 @@ end
 -- additional arguments.
 -- @return boolean: true on success, false on failure.
 function zip(zipfile, ...)
-   return fs.execute(vars.SEVENZ.." a -tzip", zipfile, ...)
+   return fs.execute_quiet(vars.SEVENZ.." a -tzip", zipfile, ...)
 end
 
 --- Uncompress files from a .zip archive.
@@ -237,7 +237,7 @@ end
 -- @return boolean: true on success, false on failure.
 function unzip(zipfile)
    assert(zipfile)
-   return fs.execute(vars.SEVENZ.." x", zipfile)
+   return fs.execute_quiet(vars.SEVENZ.." x", zipfile)
 end
 
 --- Test is pathname is a directory.
@@ -285,7 +285,7 @@ end
 -- @param archive string: Filename of archive.
 -- @return boolean : success status
 local function gunzip(archive)
-  return fs.execute(vars.SEVENZ.." x", archive)
+  return fs.execute_quiet(vars.SEVENZ.." x", archive)
 end
 
 --- Unpack an archive.