From 873b532f381d4dddabe5370dcffef49816f9f808 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Tue, 23 Jun 2020 22:52:21 +0800
Subject: add global proxy settings

---
 xmake/modules/devel/git/pull.lua | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'xmake/modules/devel/git/pull.lua')

diff --git a/xmake/modules/devel/git/pull.lua b/xmake/modules/devel/git/pull.lua
index 7eba74114..6e0f0a735 100644
--- a/xmake/modules/devel/git/pull.lua
+++ b/xmake/modules/devel/git/pull.lua
@@ -20,6 +20,7 @@
 
 -- imports
 import("core.base.option")
+import("core.base.global")
 import("lib.detect.find_tool")
 
 -- pull remote commits
@@ -63,8 +64,15 @@ function main(opt)
         oldir = os.cd(opt.repodir)
     end
 
+    -- use proxy?
+    local envs
+    local proxy = global.get("proxy")
+    if proxy then
+        envs = {ALL_PROXY = proxy}
+    end
+
     -- pull it
-    os.vrunv(git.program, argv)
+    os.vrunv(git.program, argv, {envs = envs})
 
     -- leave repository directory
     if oldir then
-- 
cgit v1.3.1