diff options
| author | ruki <[email protected]> | 2024-04-10 15:36:35 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-04-10 15:36:35 +0800 |
| commit | b559b4c1591e448b0f3faaa5928fc79e8286b8c3 (patch) | |
| tree | 786d95287a8a7bb665f5830e47ae3f3fd71b67b2 /core/xpack.lua | |
| parent | 7e7b37e4f776e76d9a88b38f6419ff5c95923ef4 (diff) | |
| parent | bcc361fcee9277dedfdcdd031d058c4de5322c73 (diff) | |
Merge pull request #4956 from xmake-io/archive
Improve archive
Diffstat (limited to 'core/xpack.lua')
| -rw-r--r-- | core/xpack.lua | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/core/xpack.lua b/core/xpack.lua index 94e21f7a2..4262ef1b5 100644 --- a/core/xpack.lua +++ b/core/xpack.lua @@ -48,18 +48,12 @@ xpack("xmake") local winenv_bindir = path.join(package:buildir(), "winenv", "bin") os.mkdir(winenv_bindir) http.download(url_7z, archive_7z, {insecure = global.get("insecure-ssl")}) - if archive.extract(archive_7z, tmpdir_7z) then - os.cp(path.join(tmpdir_7z, "*"), winenv_bindir) - else - raise("extract 7z.zip failed!") - end + archive.extract(archive_7z, tmpdir_7z) + os.cp(path.join(tmpdir_7z, "*"), winenv_bindir) http.download(url_curl, archive_curl, {insecure = global.get("insecure-ssl")}) - if archive.extract(archive_curl, tmpdir_curl) then - os.cp(path.join(tmpdir_curl, "*", "bin", "*.exe"), winenv_bindir) - os.cp(path.join(tmpdir_curl, "*", "bin", "*.crt"), winenv_bindir) - else - raise("extract curl.zip failed!") - end + archive.extract(archive_curl, tmpdir_curl) + os.cp(path.join(tmpdir_curl, "*", "bin", "*.exe"), winenv_bindir) + os.cp(path.join(tmpdir_curl, "*", "bin", "*.crt"), winenv_bindir) winenv = path.directory(winenv_bindir) package:add("installfiles", path.join(winenv, "**"), {rootdir = path.directory(winenv)}) end |