From d9727cf458cd2c50128a5f79f521253c81f281e2 Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Thu, 20 Jan 2022 09:28:55 +0100 Subject: Added support for using info-zip with 'xmake bundle' --- bundle.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'bundle.lua') diff --git a/bundle.lua b/bundle.lua index 3ab6016a8..0802ba2c8 100644 --- a/bundle.lua +++ b/bundle.lua @@ -58,6 +58,16 @@ local function _zip(zip_path, ...) end print("7z not found") + import("detect.tools.find_zip") + cmd = find_zip() + if cmd then + local ret = _exec("zip", "--junk-paths", zip_path, ...) + if ret > 0 then + raise("Received error from zip") + end + return + end + print("zip not found") raise("Unable to find a suitable zip tool") end -- cgit v1.2.3