diff --git a/lib/specinfra/backend/powershell/support/find_installed_application.ps1 b/lib/specinfra/backend/powershell/support/find_installed_application.ps1 index 4867e3c6e..de1805c9b 100644 --- a/lib/specinfra/backend/powershell/support/find_installed_application.ps1 +++ b/lib/specinfra/backend/powershell/support/find_installed_application.ps1 @@ -12,10 +12,11 @@ function FindInstalledApplication } if ($appVersion -eq $null) { - $keys | Where-Object {$_.name -like $appName -or $_.PSChildName -like $appName} + @($keys | Where-Object {$_.DisplayName -like $appName -or $_.PSChildName -like $appName}).Length -gt 0 } else{ - $keys | Where-Object {$_.name -like $appName -or $_.PSChildName -like $appName } | Where-Object {$_.DisplayVersion -eq $appVersion} + @($keys | Where-Object {$_.DisplayName -like $appName -or $_.PSChildName -like $appName } | Where-Object {$_.DisplayVersion -eq $appVersion} ).Length -gt 0 } + } diff --git a/lib/specinfra/command/windows.rb b/lib/specinfra/command/windows.rb index 028387223..ecca92b68 100644 --- a/lib/specinfra/command/windows.rb +++ b/lib/specinfra/command/windows.rb @@ -102,7 +102,7 @@ def check_installed(package, version=nil) version_selection = version.nil? ? "" : "-appVersion '#{version}'" Backend::PowerShell::Command.new do using 'find_installed_application.ps1' - exec "(FindInstalledApplication -appName '#{package}' #{version_selection}) -ne $null" + exec "(FindInstalledApplication -appName '#{package}' #{version_selection}) -eq $true" end end