From bd8a03bfbf9ba0fdc41ac78632c964c76542a4f9 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 4 May 2023 00:47:43 +0800 Subject: fix 7z extractor --- xmake/modules/utils/archive/extract.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xmake/modules/utils/archive/extract.lua b/xmake/modules/utils/archive/extract.lua index 8a6fbcd02..88ae70707 100644 --- a/xmake/modules/utils/archive/extract.lua +++ b/xmake/modules/utils/archive/extract.lua @@ -101,9 +101,10 @@ function _extract_using_7z(archivefile, outputdir, extension, opt) return false end - -- p7zip cannot extract other archive format on msys/cygwin + -- p7zip cannot extract other archive format on msys/cygwin, but it can extract .tgz -- https://github.com/xmake-io/xmake/issues/1575#issuecomment-898205462 - if is_subhost("msys", "cygwin") and extension ~= ".7z" and program:startswith("sh ") then + if is_subhost("msys", "cygwin") and program:startswith("sh ") and + extension ~= ".7z" and extension ~= ".tgz" then return false end -- cgit v1.3.1