From 5b7318eec7f0f46f57100f3d0a19aa36364511d6 Mon Sep 17 00:00:00 2001 From: Chad Gorshing Date: Fri, 5 Nov 2021 06:21:56 -0500 Subject: [PATCH] Use Test-PuppetInstalledVersion instead of Test-PuppetInstalled --- tasks/install_powershell.ps1 | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/tasks/install_powershell.ps1 b/tasks/install_powershell.ps1 index f662ee8d..b69622e7 100644 --- a/tasks/install_powershell.ps1 +++ b/tasks/install_powershell.ps1 @@ -26,16 +26,6 @@ catch [System.Management.Automation.CommandNotFoundException] { } } -function Test-PuppetInstalled { - $rootPath = 'HKLM:\SOFTWARE\Puppet Labs\Puppet' - try { - if (Get-ItemProperty -Path $rootPath) { RETURN $true } - } - catch { - RETURN $false - } -} - function Test-PuppetInstalledVersion { $rootPath = 'HKLM:\SOFTWARE\Puppet Labs\Puppet' @@ -82,7 +72,7 @@ if ($version) { } } else { - if (Test-PuppetInstalled) { + if (Test-PuppetInstalledVersion) { Write-Output "Version parameter not defined and agent detected. Nothing to do." Exit } @@ -160,5 +150,5 @@ if($_noop -eq 'true') { DownloadPuppet InstallPuppet Cleanup - Write-Output "Puppet Agent installed on $env:COMPUTERNAME" + Write-Output "Puppet Agent installed on $env:COMPUTERNAME" }