Skip to content

Forward the Original Invocation's Flags in the Download Remedy #1048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptr727 merged 3 commits into from
Aug 28, 2026
Merged

Forward the Original Invocation's Flags in the Download Remedy #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70097af
Forward the Original Invocation's Flags in the Download Remedy
ptr727 Aug 28, 2026
442cd6f
Quote Forwarded Values in the Printed Download Remedy
ptr727 Aug 28, 2026
fab6286
Classify Forwarded Values by Type, Not by Shape
ptr727 Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion host-setup/bootstrap.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,21 @@ function Get-ForwardedArgument {
return , $forward
}

# The same parameters Get-ForwardedArgument forwards, rendered as one pasteable command-line string rather than split into argv elements.
# Classified by SCRIPT_BOUND_PARAMETERS's own type rather than by a value's shape: a value that happens to look like a flag (-Ref '-Yes') would otherwise print unquoted and bind as its own switch when pasted, which is exactly the bug guessing from shape produced here before.
function Format-ForwardedArgumentForDisplay {
$parts = foreach ($key in $script:SCRIPT_BOUND_PARAMETERS.Keys) {
$value = $script:SCRIPT_BOUND_PARAMETERS[$key]
if ($value -is [switch]) {
if ($value.IsPresent) { "-$key" }
} else {
"-$key"
"'" + ("$value" -replace "'", "''") + "'"
}
}
return ($parts -join ' ')
}

function Invoke-PwshHandoff {
$pwshPath = Resolve-Pwsh
if (-not $pwshPath) { $pwshPath = Install-Pwsh }
Expand Down Expand Up @@ -385,7 +400,10 @@ function Resolve-Mode {
function Show-DownloadAndRunRemedy {
info ' [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12'
info " Invoke-WebRequest -UseBasicParsing -Uri https://raw.githubusercontent.com/$script:REPO/$script:DEFAULT_REF/host-setup/bootstrap.ps1 -OutFile bootstrap.ps1"
info ' powershell -ExecutionPolicy Bypass -File bootstrap.ps1'
# Reuses Format-ForwardedArgumentForDisplay rather than a second implementation: the original invocation's own action and flags belong on the re-run this remedy is telling the caller to make.
$forwarded = Format-ForwardedArgumentForDisplay
$suffix = if ($forwarded) { " $forwarded" } else { '' }
info " powershell -ExecutionPolicy Bypass -File bootstrap.ps1$suffix"
}

function main {
Expand Down
20 changes: 19 additions & 1 deletion host-setup/menu.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,21 @@ function Get-ForwardedArgument {
return , $forward
}

# The same parameters Get-ForwardedArgument forwards, rendered as one pasteable command-line string rather than split into argv elements.
# Classified by SCRIPT_BOUND_PARAMETERS's own type rather than by a value's shape: a value that happens to look like a flag (-Ref '-Yes') would otherwise print unquoted and bind as its own switch when pasted, which is exactly the bug guessing from shape produced here before.
function Format-ForwardedArgumentForDisplay {
$parts = foreach ($key in $script:SCRIPT_BOUND_PARAMETERS.Keys) {
$value = $script:SCRIPT_BOUND_PARAMETERS[$key]
if ($value -is [switch]) {
if ($value.IsPresent) { "-$key" }
} else {
"-$key"
"'" + ("$value" -replace "'", "''") + "'"
}
}
return ($parts -join ' ')
}

function Invoke-PwshHandoff {
$pwshPath = Resolve-Pwsh
if (-not $pwshPath) { $pwshPath = Install-Pwsh }
Expand Down Expand Up @@ -514,7 +529,10 @@ function Resolve-Directory {
function Show-DownloadAndRunRemedy {
info ' [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12'
info " Invoke-WebRequest -UseBasicParsing -Uri https://raw.githubusercontent.com/$script:HUB_REPO/$script:DEFAULT_REF/host-setup/menu.ps1 -OutFile menu.ps1"
info ' powershell -ExecutionPolicy Bypass -File menu.ps1'
# Reuses Format-ForwardedArgumentForDisplay rather than a second implementation: the original invocation's own flags (-DryRun among them) belong on the re-run this remedy is telling the caller to make.
$forwarded = Format-ForwardedArgumentForDisplay
$suffix = if ($forwarded) { " $forwarded" } else { '' }
info " powershell -ExecutionPolicy Bypass -File menu.ps1$suffix"
}

function main {
Expand Down