fix install-sshd incompatability with windows pwsh 5.1 (#590)

tgauth · web-flow · commit 9598cec2fc0b · 2022-03-24T10:32:32.000-07:00
diff --git a/contrib/win32/openssh/install-sshd.ps1 b/contrib/win32/openssh/install-sshd.ps1
@@ -86,7 +86,13 @@ if (Test-Path $sshAgentRegPath)
 $moduliPath = Join-Path $PSScriptRoot "moduli"
 if (Test-Path $moduliPath -PathType Leaf)
 {
-    Repair-ModuliFilePermission -FilePath $moduliPath @psBoundParameters -confirm:$false
+    # if user calls .\install-sshd.ps1 with -confirm, use that
+    # otherwise, need to preserve legacy behavior
+    if (-not $PSBoundParameters.ContainsKey('confirm'))
+    {
+        $PSBoundParameters.add('confirm', $false)
+    }
+    Repair-ModuliFilePermission -FilePath $moduliPath @psBoundParameters
 }
 
 # If %programData%/ssh folder already exists, verify and, if necessary and approved by user, fix permissions 

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,13 @@ if (Test-Path $sshAgentRegPath)`
`86`	`86`	`$moduliPath = Join-Path $PSScriptRoot "moduli"`
`87`	`87`	`if (Test-Path $moduliPath -PathType Leaf)`
`88`	`88`	`{`
`89`		`- Repair-ModuliFilePermission -FilePath $moduliPath @psBoundParameters -confirm:$false`
	`89`	`+ # if user calls .\install-sshd.ps1 with -confirm, use that`
	`90`	`+ # otherwise, need to preserve legacy behavior`
	`91`	`+ if (-not $PSBoundParameters.ContainsKey('confirm'))`
	`92`	`+ {`
	`93`	`+ $PSBoundParameters.add('confirm', $false)`
	`94`	`+ }`
	`95`	`+ Repair-ModuliFilePermission -FilePath $moduliPath @psBoundParameters`
`90`	`96`	`}`
`91`	`97`
`92`	`98`	`# If %programData%/ssh folder already exists, verify and, if necessary and approved by user, fix permissions`