summaryrefslogtreecommitdiff
path: root/xmake/modules/detect/tools/find_zip.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2017-09-22 00:40:49 +0800
committerruki <[email protected]>2017-09-21 22:04:55 +0800
commitab5456ca3457c7b59de6cc590068d91d7749d096 (patch)
tree329742618ea8ef110542f27fa48f4226a20dde9c /xmake/modules/detect/tools/find_zip.lua
parent034185734b5bc91f8188c15c9e02b0ce8ebaa850 (diff)
modify find_program interface
Diffstat (limited to 'xmake/modules/detect/tools/find_zip.lua')
-rw-r--r--xmake/modules/detect/tools/find_zip.lua8
1 files changed, 5 insertions, 3 deletions
diff --git a/xmake/modules/detect/tools/find_zip.lua b/xmake/modules/detect/tools/find_zip.lua
index 9b2cf2824..0de995cd0 100644
--- a/xmake/modules/detect/tools/find_zip.lua
+++ b/xmake/modules/detect/tools/find_zip.lua
@@ -42,15 +42,17 @@ import("lib.detect.find_programver")
function main(opt)
-- init options
- opt = opt or {}
+ opt = opt or {}
+ opt.check = opt.check or "-v"
+ opt.command = opt.command or "-v"
-- find program
- local program = find_program(opt.program or "zip", opt.pathes, opt.check or "-v")
+ local program = find_program(opt.program or "zip", opt)
-- find program version
local version = nil
if program and opt and opt.version then
- version = find_programver(program, "-v")
+ version = find_programver(program, opt)
end
-- ok?