Merge branch 'hotfix/3.0.3'

AdmiringWorm · AdmiringWorm · commit c7e9336dc042 · 2023-10-06T11:42:43.000+02:00
* hotfix/3.0.3: (#548) Remove creation of Chocolatey Install Directory
diff --git a/Boxstarter.TestRunner/Bootstrap.ps1 b/Boxstarter.TestRunner/Bootstrap.ps1
@@ -2,7 +2,6 @@ function Bootstrap-Boxstarter {
     if(-not $env:ChocolateyInstall -or -not (Test-Path "$env:ChocolateyInstall")){
         Write-Output "Chocolatey not installed. Downloading and installing..."
         $env:ChocolateyInstall = "$env:programdata\chocolatey"
-        New-Item $env:ChocolateyInstall -Force -type directory | Out-Null
         Get-HttpToFile "https://chocolatey.org/install.ps1" "$env:temp\choco.ps1"
         . "$env:temp\choco.ps1"
     }
diff --git a/BuildScripts/bootstrapper.ps1 b/BuildScripts/bootstrapper.ps1
@@ -82,7 +82,6 @@ function Check-Chocolatey {
             }
             try {
                 $env:ChocolateyInstall = "$env:programdata\chocolatey"
-                New-Item $env:ChocolateyInstall -Force -type directory | Out-Null
                 $url="https://chocolatey.org/api/v2/package/chocolatey/"
                 $wc=new-object net.webclient
                 $wp=[system.net.WebProxy]::GetDefaultProxy()

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ function Bootstrap-Boxstarter {`
`2`	`2`	`if(-not $env:ChocolateyInstall -or -not (Test-Path "$env:ChocolateyInstall")){`
`3`	`3`	`Write-Output "Chocolatey not installed. Downloading and installing..."`
`4`	`4`	`$env:ChocolateyInstall = "$env:programdata\chocolatey"`
`5`		`- New-Item $env:ChocolateyInstall -Force -type directory \| Out-Null`
`6`	`5`	`Get-HttpToFile "https://chocolatey.org/install.ps1" "$env:temp\choco.ps1"`
`7`	`6`	`. "$env:temp\choco.ps1"`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,6 @@ function Check-Chocolatey {`
`82`	`82`	`}`
`83`	`83`	`try {`
`84`	`84`	`$env:ChocolateyInstall = "$env:programdata\chocolatey"`
`85`		`- New-Item $env:ChocolateyInstall -Force -type directory \| Out-Null`
`86`	`85`	`$url="https://chocolatey.org/api/v2/package/chocolatey/"`
`87`	`86`	`$wc=new-object net.webclient`
`88`	`87`	`$wp=[system.net.WebProxy]::GetDefaultProxy()`