Merge pull request #1102 from bgeihsgt/win_webpicmd_fix

Fix #1101: win_webpicmd strict mode fixes
This commit is contained in:
Brian Coca 2015-12-08 09:35:09 -05:00
commit f2dbaa6b33

View file

@ -42,9 +42,9 @@ Function Find-Command
)
$installed = get-command $command -erroraction Ignore
write-verbose "$installed"
if ($installed.length -gt 0)
if ($installed)
{
return $installed[0]
return $installed
}
return $null
}
@ -87,8 +87,12 @@ Function Test-IsInstalledFromWebPI
}
Write-Verbose "$results"
$matches = $results | select-string -pattern "^$package\s+"
return $matches.length -gt 0
if ($results -match "^$package\s+")
{
return $true
}
return $false
}
Function Install-WithWebPICmd
@ -112,8 +116,8 @@ Function Install-WithWebPICmd
}
write-verbose "$results"
$success = $results | select-string -pattern "Install of Products: SUCCESS"
if ($success.length -gt 0)
if ($results -match "Install of Products: SUCCESS")
{
$result.changed = $true
}