cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1102 from bgeihsgt/win_webpicmd_fix

Browse source 
Fix #1101: win_webpicmd strict mode fixes
This commit is contained in:
Brian Coca 2015-12-08 09:35:09 -05:00
commit f2dbaa6b33
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
windows/win_webpicmd.ps1
View file

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