fix(git): HTTP(S)_PROXY only in process scope to prevent race condition

ScoopInstaller · Mar 20, 2023 · b5eee91 · b5eee91
1 parent 2accaae
commit b5eee91
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -155,25 +155,18 @@ function Invoke-Git {
     }
 
     if($ArgumentList -Match '\b(clone|checkout|pull|fetch|ls-remote)\b') {
-        $old_https = $env:HTTPS_PROXY
-        $old_http = $env:HTTP_PROXY
-        try {
+        $j = Start-Job -ScriptBlock {
             # convert proxy setting for git
-            if ($proxy.StartsWith('currentuser@')) {
+            $proxy = $using:proxy
+            if ($proxy -and $proxy.StartsWith('currentuser@')) {
                 $proxy = $proxy.Replace('currentuser@', ':@')
             }
             $env:HTTPS_PROXY = $proxy
             $env:HTTP_PROXY = $proxy
-            return & $git @ArgumentList
-        }
-        catch {
-            error $_
-            return
-        }
-        finally {
-            $env:HTTPS_PROXY = $old_https
-            $env:HTTP_PROXY = $old_http
+            & $using:git @using:ArgumentList
         }
+        $o = $j | Receive-Job -Wait -AutoRemoveJob
+        return $o
     }
 
     return & $git @ArgumentList