Provide proxy config to git

Author: xxthunder

.github/workflows/ci.yml

@@ -21,6 +21,14 @@ jobs:
       - name: Test Scoop Installer
         shell: powershell
         run: ./test/bin/test.ps1
+      - name: Test Scoop Install command
+        shell: powershell
+        run: |
+          ./install.ps1 -RunAsAdmin
+          echo "$Env:USERPROFILE\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      - name: Test scoop command availability
+        shell: powershell
+        run: scoop status
   test_pwsh:
     name: PowerShell
     runs-on: windows-latest
@@ -37,3 +45,11 @@ jobs:
       - name: Test Scoop Installer
         shell: pwsh
         run: ./test/bin/test.ps1
+      - name: Test Scoop Install command
+        shell: pwsh
+        run: |
+          ./install.ps1 -RunAsAdmin
+          echo "~\scoop\shims" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      - name: Test scoop command availability
+        shell: pwsh
+        run: scoop status

install.ps1

@@ -45,7 +45,7 @@
 .PARAMETER Proxy
     Specifies proxy to use during the installation.
 .PARAMETER ProxyCredential
-    Specifies credential for the given prxoy.
+    Specifies credential for the given proxy.
 .PARAMETER ProxyUseDefaultCredentials
     Use the credentials of the current user for the proxy server that is specified by the -Proxy parameter.
 .PARAMETER RunAsAdmin
@@ -498,15 +498,21 @@ function Install-Scoop {
     # Enable TLS 1.2
     Optimize-SecurityProtocol
 
+    # Download scoop from GitHub
+    Write-InstallInfo "Downloading ..."
+    $downloader = Get-Downloader
+
     if (Test-Command-Available('git')) {
+        if ($downloader.Proxy) {
+            #define env vars for git when behind a proxy
+            $Env:HTTP_PROXY = $downloader.Proxy.Address
+            $Env:HTTPS_PROXY = $downloader.Proxy.Address
+        }
         Write-Verbose "Cloning $SCOOP_PACKAGE_GIT_REPO to $SCOOP_APP_DIR"
         git clone $SCOOP_PACKAGE_GIT_REPO $SCOOP_APP_DIR
         Write-Verbose "Cloning $SCOOP_MAIN_BUCKET_GIT_REPO to $SCOOP_MAIN_BUCKET_DIR"
         git clone $SCOOP_MAIN_BUCKET_GIT_REPO $SCOOP_MAIN_BUCKET_DIR
     } else {
-        # Download scoop zip from GitHub
-        Write-InstallInfo "Downloading..."
-        $downloader = Get-Downloader
         # 1. download scoop
         $scoopZipfile = "$SCOOP_APP_DIR\scoop.zip"
         if (!(Test-Path $SCOOP_APP_DIR)) {

test/install.Tests.ps1

@@ -0,0 +1,29 @@
+BeforeAll {
+    # Load SUT
+    $sut = (Split-Path -Leaf $PSCommandPath).Replace('.Tests.ps1', '.ps1')
+    . ".\$sut"
+}
+
+Describe 'Get-Downloader' -Tag 'Proxy' {
+    Context 'No proxy given via script parameter' {
+        It 'Returns WebClient without proxy' {
+            $NoProxy = $true
+            Test-ValidateParameter
+            (Get-Downloader).Proxy | Should -Be $null
+        }
+        It 'Returns WebClient without proxy although proxy is given' {
+            $NoProxy = $true
+            $Proxy = New-Object System.Uri('http://donotcare')
+            Test-ValidateParameter
+            (Get-Downloader).Proxy | Should -Be $null
+        }
+    }
+    Context 'Proxy given via script parameter' {
+        It 'Returns WebClient with proxy' {
+            $ProxyString = 'http://some.proxy.with.port:8080'
+            $Proxy = New-Object System.Uri($ProxyString)
+            Test-ValidateParameter
+            (Get-Downloader).Proxy.Address | Should -Be "$ProxyString/"
+        }
+    }
+}