Merge pull request PowerShell#58 from sethvs/shouldProcess

Bruce Payette · web-flow · commit 4c6593649b14 · 2018-11-12T17:40:50.000-08:00
Fix ShouldProcess for Add-WindowsPSModulePath
diff --git a/WindowsCompatibility/WindowsCompatibility.psm1 b/WindowsCompatibility/WindowsCompatibility.psm1
@@ -759,7 +759,7 @@ function Add-WindowsPSModulePath
     )
 
     $pathTable = [ordered] @{}
-    $doUpdate = $false
+
     foreach ($path in $paths)
     {
         if ($pathTable[$path])
@@ -770,14 +770,9 @@ function Add-WindowsPSModulePath
         if ($PSCmdlet.ShouldProcess($path, "Add to PSModulePath"))
         {
             Write-Verbose -Verbose:$verboseFlag "Adding '$path' to the PSModulePath."
-            $doUpdate = $true
+            $pathTable[$path] = $true
         }
-
-        $pathTable[$path] = $true
     }
 
-    if ($doUpdate)
-    {
-        $Env:PSModulePath = $pathTable.Keys -join [System.IO.Path]::PathSeparator
-    }
+    $Env:PSModulePath = $pathTable.Keys -join [System.IO.Path]::PathSeparator
 }

Original file line number	Diff line number	Diff line change
`@@ -759,7 +759,7 @@ function Add-WindowsPSModulePath`
`759`	`759`	`)`
`760`	`760`
`761`	`761`	`$pathTable = [ordered] @{}`
`762`		`- $doUpdate = $false`
	`762`	`+`
`763`	`763`	`foreach ($path in $paths)`
`764`	`764`	`{`
`765`	`765`	`if ($pathTable[$path])`
`@@ -770,14 +770,9 @@ function Add-WindowsPSModulePath`
`770`	`770`	`if ($PSCmdlet.ShouldProcess($path, "Add to PSModulePath"))`
`771`	`771`	`{`
`772`	`772`	`Write-Verbose -Verbose:$verboseFlag "Adding '$path' to the PSModulePath."`
`773`		`- $doUpdate = $true`
	`773`	`+ $pathTable[$path] = $true`
`774`	`774`	`}`
`775`		`-`
`776`		`- $pathTable[$path] = $true`
`777`	`775`	`}`
`778`	`776`
`779`		`- if ($doUpdate)`
`780`		`- {`
`781`		`- $Env:PSModulePath = $pathTable.Keys -join [System.IO.Path]::PathSeparator`
`782`		`- }`
	`777`	`+ $Env:PSModulePath = $pathTable.Keys -join [System.IO.Path]::PathSeparator`
`783`	`778`	`}`