From 613bf58d8b66c0f8d8b61389241d7cb0849ebcfe Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 22 Sep 2017 22:40:44 +0800 Subject: improve to install package for xmake.lua --- xmake/actions/require/action/install.lua | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/xmake/actions/require/action/install.lua b/xmake/actions/require/action/install.lua index a1c6dc343..583276ffe 100644 --- a/xmake/actions/require/action/install.lua +++ b/xmake/actions/require/action/install.lua @@ -32,10 +32,7 @@ import("test") function _install_for_xmakefile(package) -- package to install directory - os.vrun("xmake p -o %s", package:installdir()) - - -- ok - return true + os.vrunv("xmake", {"p", "-o", package:installdir()}) end -- install for generic @@ -137,9 +134,6 @@ option("%s") -- exit file file:close() end - - -- ok - return true end -- on install the given package @@ -166,7 +160,8 @@ function _on_install_package(package) -- attempt to install it if file exists local files = os.files(installscript[1]) if #files > 0 then - return installscript[2](package) + installscript[2](package) + return true end end, -- cgit v1.3.1