summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-09-23 00:32:41 +0800
committerruki <[email protected]>2017-09-22 21:16:08 +0800
commitdd224f17541d5011ce1f277f8dd76e82a22540dc (patch)
treec1b83e2ee2ba1fd9f36ef877a6be2ac2940f0f0e
parent1b6960adbd9890de7e4057ae61594881fdc8da3e (diff)
fix install require
-rw-r--r--xmake/actions/require/install.lua18
1 files changed, 9 insertions, 9 deletions
diff --git a/xmake/actions/require/install.lua b/xmake/actions/require/install.lua
index 19f90257f..6b6e116f0 100644
--- a/xmake/actions/require/install.lua
+++ b/xmake/actions/require/install.lua
@@ -138,15 +138,6 @@ end
-- install packages
function _install_packages(requires)
- -- init requires
- local requires_extra = nil
- if not requires then
- requires, requires_extra = project.requires()
- end
- if not requires or #requires == 0 then
- return
- end
-
-- pull all repositories first if not exists
--
-- attempt to install git from the builtin-packages first if git not found
@@ -232,6 +223,15 @@ function main(requires)
if _g.installed then return end
_g.installed = true
+ -- init requires
+ local requires_extra = nil
+ if not requires then
+ requires, requires_extra = project.requires()
+ end
+ if not requires or #requires == 0 then
+ return
+ end
+
-- enter environment
environment.enter()