upstream/icinga-powershell-framework
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-powershell-framework.git synced 2026-02-03 04:09:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #727 from Icinga:fix/leading_backslash_for_service_binary_on_first_installation

Browse source 
Fix: Leading backslash for service binary on initial setup

Fixes leading `\` for the service binary path and directory, which results in wrong behavior while using the same shell on which the initial installation was made
This commit is contained in:
Lord Hepipud 2024-04-24 13:11:47 +02:00 committed by GitHub
commit c572842303
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/100-General/10-Changelog.md
View file

@ -18,6 +18,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
### Bugfixes
* [#718](https://github.com/Icinga/icinga-powershell-framework/issues/718) Fixes Icinga repository JSON validator to report the correct state of the validation status, in case the JSON is not valid
* [#722](https://github.com/Icinga/icinga-powershell-framework/issues/722) Fixes leading `\` for the service binary path and directory, which results in wrong behavior while using the same shell on which the initial installation was made
* [#724](https://github.com/Icinga/icinga-powershell-framework/issues/724) Fixes `icingaforwindows.pfx` creation in case another `certutil` is installed on the system and being available in the `PATH` environment
* [#725](https://github.com/Icinga/icinga-powershell-framework/pull/725) Fixes Icinga for Windows certificate handling by keeping the .pfx file on the system as created, without using the certificate store. Also fixes handling for providing thumbprints for certificates, which are now loaded directly from the certificate store by also providing a new filter mechanic to fetch the proper certificates from the store

2
lib/core/repository/Get-IcingaForWindowsServiceData.psm1
View file

@ -12,7 +12,7 @@ function Get-IcingaForWindowsServiceData()
if ($null -ne $IcingaForWindowsService -And ([string]::IsNullOrEmpty($IcingaForWindowsService.ServicePath)) -eq $FALSE) {
$ServicePath = $IcingaForWindowsService.ServicePath;
$ServicePath = $ServicePath.SubString(0, $ServicePath.IndexOf('.exe') + 4);
$ServicePath = $ServicePath.Replace('"', '');
$ServicePath = $ServicePath.Replace('\"', '').Replace('"', '');
$ServiceData.Binary = $ServicePath.SubString($ServicePath.LastIndexOf('\') + 1, $ServicePath.Length - $ServicePath.LastIndexOf('\') - 1);
$ServiceData.FullPath = $ServicePath;
$ServiceData.Directory = $ServicePath.Substring(0, $ServicePath.LastIndexOf('\') + 1);