Skip to content

Commit ec8ec06

Browse files
Revert "(chocolatey#218) Update path for testing off develop"
1 parent 3d2184a commit ec8ec06

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

Start-C4bSetup.ps1

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,17 @@ param(
3535
)
3636

3737
begin {
38-
if ($host.name -ne 'ConsoleHost') {
38+
if($host.name -ne 'ConsoleHost') {
3939
Write-Warning "This script cannot be ran from within PowerShell ISE"
4040
Write-Warning "Please launch powershell.exe as an administrator, and run this script again"
4141
break
4242
}
4343

44-
if ($env:CHOCO_QSG_DEVELOP) {
44+
if($env:CHOCO_QSG_DEVELOP){
4545
$QsRepo = "https://github.com/chocolatey/choco-quickstart-scripts/archive/refs/heads/develop.zip"
46-
$branchName = 'develop'
4746
}
4847
else {
4948
$QsRepo = "https://github.com/chocolatey/choco-quickstart-scripts/archive/main.zip"
50-
$branchName = 'main'
5149
}
5250
}
5351

@@ -140,18 +138,17 @@ process {
140138
$PkgsDir = "$ChocoPath\packages"
141139
$TempDir = "$ChocoPath\temp"
142140
$TestDir = "$ChocoPath\tests"
143-
@($ChocoPath, $FilesDir, $PkgsDir, $TempDir, $TestDir) |
141+
@($ChocoPath, $FilesDir, $PkgsDir, $TempDir,$TestDir) |
144142
Foreach-Object {
145143
$null = New-Item -Path $_ -ItemType Directory -Force
146144
}
147145

148146
# Download and extract C4B setup files from repo
149-
150-
Invoke-WebRequest -Uri $QsRepo -UseBasicParsing -OutFile "$TempDir\$branchName.zip"
151-
Expand-Archive "$TempDir\$branchName.zip" $TempDir
152-
Copy-Item "$TempDir\choco-quickstart-scripts-$branchName\*" $FilesDir -Recurse
147+
Invoke-WebRequest -Uri $QsRepo -UseBasicParsing -OutFile "$TempDir\main.zip"
148+
Expand-Archive "$TempDir\main.zip" $TempDir
149+
Copy-Item "$TempDir\choco-quickstart-scripts-main\*" $FilesDir -Recurse
153150
Remove-Item "$TempDir" -Recurse -Force
154-
151+
155152
# Convert license to a "choco-license" package, and install it locally to test
156153
Write-Host "Creating a "chocolatey-license" package, and testing install." -ForegroundColor Green
157154
Set-Location $FilesDir

0 commit comments

Comments
 (0)