From 987a52c418a767594857d43bf187200db6f92c3c Mon Sep 17 00:00:00 2001 From: Lord Hepipud Date: Fri, 22 May 2020 13:42:23 +0200 Subject: [PATCH] Improves console output for certain commands --- .../installer/Install-IcingaAgentCertificates.psm1 | 2 +- lib/core/icingaagent/installer/Uninstall-IcingaAgent.psm1 | 6 +++--- .../icingaagent/misc/Move-IcingaAgentDefaultConfig.psm1 | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/core/icingaagent/installer/Install-IcingaAgentCertificates.psm1 b/lib/core/icingaagent/installer/Install-IcingaAgentCertificates.psm1 index a82538d..77722cc 100644 --- a/lib/core/icingaagent/installer/Install-IcingaAgentCertificates.psm1 +++ b/lib/core/icingaagent/installer/Install-IcingaAgentCertificates.psm1 @@ -194,7 +194,7 @@ function Test-IcingaAgentCertificates() } } - Write-IcingaConsoleNotice 'Icinga host certificates are present and valid. No generation required.'; + Write-IcingaConsoleNotice 'Icinga host certificates are present and valid. No generation required'; return $TRUE; } diff --git a/lib/core/icingaagent/installer/Uninstall-IcingaAgent.psm1 b/lib/core/icingaagent/installer/Uninstall-IcingaAgent.psm1 index 740e339..ef1d852 100644 --- a/lib/core/icingaagent/installer/Uninstall-IcingaAgent.psm1 +++ b/lib/core/icingaagent/installer/Uninstall-IcingaAgent.psm1 @@ -11,20 +11,20 @@ function Uninstall-IcingaAgent() return; } - Write-IcingaConsoleNotice 'Removing current installed Icinga Agent'; + Write-IcingaConsoleNotice 'Removing current Icinga Agent'; Stop-IcingaService 'icinga2'; $Uninstaller = Start-IcingaProcess -Executable 'MsiExec.exe' -Arguments ([string]::Format('{0} /q', $IcingaData.Uninstaller)) -FlushNewLine; if ($Uninstaller.ExitCode -ne 0) { - Write-IcingaConsoleError ([string]::Format('Failed to remove Icinga 2 Agent: {0}{1}', $Uninstaller.Message, $Uninstaller.Error)); + Write-IcingaConsoleError ([string]::Format('Failed to remove Icinga Agent: {0}{1}', $Uninstaller.Message, $Uninstaller.Error)); return $FALSE; } if ($RemoveDataFolder) { [string]$IcingaProgramData = Join-Path -Path $Env:ProgramData -ChildPath 'icinga2'; - Write-IcingaConsoleNotice -Message 'Removing Icinga 2 directoy from ProgramData: "{0}"' -Objects $IcingaProgramData; + Write-IcingaConsoleNotice -Message 'Removing Icinga Agent directory: "{0}"' -Objects $IcingaProgramData; if ((Remove-ItemSecure -Path $IcingaProgramData -Recurse -Force) -eq $FALSE) { return $FALSE; } diff --git a/lib/core/icingaagent/misc/Move-IcingaAgentDefaultConfig.psm1 b/lib/core/icingaagent/misc/Move-IcingaAgentDefaultConfig.psm1 index 0a5f940..901d6cf 100644 --- a/lib/core/icingaagent/misc/Move-IcingaAgentDefaultConfig.psm1 +++ b/lib/core/icingaagent/misc/Move-IcingaAgentDefaultConfig.psm1 @@ -4,7 +4,7 @@ function Move-IcingaAgentDefaultConfig() $BackupFile = Join-Path -Path $ConfigDir -ChildPath 'ps_backup\backup_executed.key'; if ((Test-Path $BackupFile)) { - Write-IcingaConsoleNotice 'A backup of your default configuration is not required. A backup was already made.'; + Write-IcingaConsoleNotice 'A backup of your default configuration is not required. A backup was already made'; return; }