From 4c2f4f14295107b7d95537a3254d8ef20f475d66 Mon Sep 17 00:00:00 2001
From: Vipon <valerakonychev@gmail.com>
Date: Sun, 19 May 2024 01:13:53 +0200
Subject: [PATCH] Fix win build.

---
 python/setupEnv/setupEnv | 4 +++-
 python/vpy/git.py        | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/python/setupEnv/setupEnv b/python/setupEnv/setupEnv
index 0f5183d..1099fbf 100755
--- a/python/setupEnv/setupEnv
+++ b/python/setupEnv/setupEnv
@@ -273,7 +273,9 @@ class SetUpQueue:
             if os.name == "nt":
                 # Previous installations can update user's PATH
                 env = dict(os.environ)
-                env['PATH'] = get_user_path()
+                for p in get_user_path().split(';'):
+                    if not p in env['PATH']:
+                        env['PATH'] = env['PATH'] + p + ';'
             execCmd(args, env)
 
             i.status = SetUpQueue.SetUpInstance.InstanceState.INSTALLED
diff --git a/python/vpy/git.py b/python/vpy/git.py
index 573f720..b36f1fa 100644
--- a/python/vpy/git.py
+++ b/python/vpy/git.py
@@ -22,11 +22,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import subprocess
+from . import cmd as cmd
 
 GIT_BIN = 'git'
 
 def clone(args: [str]):
     args = [GIT_BIN, 'clone'] + args
-    subprocess.run(args)
+    cmd.execCmd(args, captureOut=True)