From 4c967342bd2ed77e007334485e1039e516794669 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Thu, 24 Oct 2013 12:40:35 -0200 Subject: Add option to make 7z overwrite zip files, matching unzip behavior on Unix. Flag suggested by @siffiejoe. Should fix problems mentioned in #167. --- src/luarocks/fs/win32/tools.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua index a79421b6..bfabe9a9 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_quiet(vars.SEVENZ.." a -tzip", zipfile, ...) + return fs.execute_quiet(vars.SEVENZ.." -aoa 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_quiet(vars.SEVENZ.." x", zipfile) + return fs.execute_quiet(vars.SEVENZ.." -aoa x", zipfile) end --- Test is pathname is a directory. @@ -298,7 +298,7 @@ end -- @param archive string: Filename of archive. -- @return boolean : success status local function gunzip(archive) - return fs.execute_quiet(vars.SEVENZ.." x", archive) + return fs.execute_quiet(vars.SEVENZ.." -aoa x", archive) end --- Unpack an archive. @@ -310,7 +310,7 @@ function unpack_archive(archive) assert(type(archive) == "string") local ok - local sevenzx = vars.SEVENZ.." x" + local sevenzx = vars.SEVENZ.." -aoa x" if archive:match("%.tar%.gz$") then ok = gunzip(archive) if ok then -- cgit v1.2.3-55-g6feb