From 8a6d697308162874a236c84aac0b0f8c7ac01f83 Mon Sep 17 00:00:00 2001 From: Ogulcan Celik Date: Tue, 1 Sep 2026 14:48:45 +0300 Subject: refactor: separate website presentation from runtime --- scripts/windows_install_conpty_package_test.ps1 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'scripts/windows_install_conpty_package_test.ps1') diff --git a/scripts/windows_install_conpty_package_test.ps1 b/scripts/windows_install_conpty_package_test.ps1 index 264fafe2..055de63f 100644 --- a/scripts/windows_install_conpty_package_test.ps1 +++ b/scripts/windows_install_conpty_package_test.ps1 @@ -6,8 +6,8 @@ param( Set-StrictMode -Version Latest $ErrorActionPreference = "Stop" -$installerPath = (Resolve-Path -LiteralPath "$PSScriptRoot\..\website\install.ps1").Path -$bootstrapPath = (Resolve-Path -LiteralPath "$PSScriptRoot\..\website\install.cmd").Path +$installerPath = (Resolve-Path -LiteralPath "$PSScriptRoot\..\distribution\install.ps1").Path +$bootstrapPath = (Resolve-Path -LiteralPath "$PSScriptRoot\..\distribution\install.cmd").Path $bootstrapContent = Get-Content -LiteralPath $bootstrapPath -Raw foreach ($forbiddenCommand in @("Invoke-RestMethod", "Invoke-WebRequest", "Invoke-Expression", "iex")) { if ($bootstrapContent -match "(?i)\b$forbiddenCommand\b") { @@ -263,7 +263,7 @@ try { $badManifest | ConvertTo-Json -Depth 5 | Out-File -LiteralPath $previewManifestPath -Encoding utf8 $downloadFailed = $false try { - & "$PSScriptRoot\..\website\install.ps1" ` + & "$PSScriptRoot\..\distribution\install.ps1" ` -Channel preview ` -ManifestUrl $previewManifestUrl ` -InstallDir $installDir ` @@ -389,7 +389,7 @@ try { } } - & "$PSScriptRoot\..\website\install.ps1" ` + & "$PSScriptRoot\..\distribution\install.ps1" ` -Channel preview ` -ManifestUrl $previewManifestUrl ` -InstallDir $installDir ` @@ -402,7 +402,7 @@ try { $junctionTarget = Join-Path $root "junction-target" Move-Item -LiteralPath $x64HostDir -Destination $junctionTarget New-Item -ItemType Junction -Path $x64HostDir -Target $junctionTarget | Out-Null - & "$PSScriptRoot\..\website\install.ps1" ` + & "$PSScriptRoot\..\distribution\install.ps1" ` -Channel preview ` -ManifestUrl $previewManifestUrl ` -InstallDir $installDir ` @@ -414,7 +414,7 @@ try { $rejected = $false try { - & "$PSScriptRoot\..\website\install.ps1" ` + & "$PSScriptRoot\..\distribution\install.ps1" ` -Channel preview ` -ManifestUrl $previewManifestUrl ` -InstallDir $installDir ` @@ -430,7 +430,7 @@ try { } $stableManifest | Out-File -LiteralPath $stableManifestPath -Encoding utf8 - & "$PSScriptRoot\..\website\install.ps1" ` + & "$PSScriptRoot\..\distribution\install.ps1" ` -Channel stable ` -ManifestUrl $stableManifestUrl ` -InstallDir $installDir @@ -465,7 +465,7 @@ exit /b 1 $preserveBin = Join-Path $root "preserve-bin" $env:HERDR_HOME = $preserveHome $env:Path = "$fakeBin;$oldProcessPath" - & "$PSScriptRoot\..\website\install.ps1" ` + & "$PSScriptRoot\..\distribution\install.ps1" ` -ManifestUrl "http://127.0.0.1:$port/candidate.json" ` -InstallDir $preserveBin ` -ExpectedBuildId "installer-test" @@ -476,7 +476,7 @@ exit /b 1 throw "installer did not preserve the existing preview channel" } - & "$PSScriptRoot\..\website\install.ps1" ` + & "$PSScriptRoot\..\distribution\install.ps1" ` -Channel stable ` -ManifestUrl $stableManifestUrl ` -InstallDir $preserveBin -- cgit v1.2.3