summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérôme Leclercq <[email protected]>2022-12-21 20:35:51 +0100
committerGitHub <[email protected]>2022-12-21 20:35:51 +0100
commit6759878d6d0ada5a44c1da8bf6d3c9d9ee58ca8a (patch)
treebde701e7e6ad4741b7768bf390091c403604dce2
parent30fbe9007008e20e709af947272719ea31e43a67 (diff)
Fix .zip decompression when unzip is not installed
-rw-r--r--xmake/modules/utils/archive/extract.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/modules/utils/archive/extract.lua b/xmake/modules/utils/archive/extract.lua
index f8098d834..7ae71dcda 100644
--- a/xmake/modules/utils/archive/extract.lua
+++ b/xmake/modules/utils/archive/extract.lua
@@ -399,7 +399,7 @@ function main(archivefile, outputdir, opt)
-- tar/windows can not extract .bz2 ...
extractors =
{
- [".zip"] = {_extract_using_7z, _extract_using_unzip, _extract_using_tar}
+ [".zip"] = {_extract_using_7z, _extract_using_unzip}
, [".7z"] = {_extract_using_7z}
, [".gz"] = {_extract_using_7z, _extract_using_gzip, _extract_using_tar}
, [".xz"] = {_extract_using_7z, _extract_using_xz, _extract_using_tar}
@@ -414,7 +414,7 @@ function main(archivefile, outputdir, opt)
else
extractors =
{
- [".zip"] = {_extract_using_unzip, _extract_using_tar, _extract_using_7z}
+ [".zip"] = {_extract_using_unzip, _extract_using_7z}
, [".7z"] = {_extract_using_7z}
, [".gz"] = {_extract_using_gzip, _extract_using_tar, _extract_using_7z}
, [".xz"] = {_extract_using_xz, _extract_using_tar, _extract_using_7z}