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

Properly detect OS arch (not current shell arch)

Browse source 
[IntPtr]::Size depends on the PS exe arch, but there's also an x86 one
on x64. But Env:ProgramFiles(x86) is always defined on an x64 OS.

https://stackoverflow.com/a/61396489
This commit is contained in:
Alexander A. Klimov 2024-07-04 15:03:52 +02:00
parent 15b464f78c
commit e08f785608
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/core/icingaagent/getters/Get-IcingaAgentInstallation.psm1
View file

@ -1,12 +1,12 @@
function Get-IcingaAgentInstallation()
{
[string]$architecture = '';
if ([IntPtr]::Size -eq 4) {
$architecture = "x86";
$regPath = 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*';
} else {
if (Test-Path 'Env:ProgramFiles(x86)') {
$architecture = "x86_64";
$regPath = @('HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*', 'HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*');
} else {
$architecture = "x86";
$regPath = 'HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*';
}
$RegistryData = Get-ItemProperty $regPath;

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

@ -33,7 +33,7 @@ function Get-IcingaRepositoryPackage()
$SourceRepo = $null;
$RepoName = $null;
[bool]$HasRepo = $FALSE;
[bool]$Isx86 = [bool]([IntPtr]::Size -eq 4);
[bool]$Isx86 = [bool](-not (Test-Path 'Env:ProgramFiles(x86)'));
foreach ($entry in $Repositories) {
$RepoContent = Read-IcingaRepositoryFile -Name $entry.Name;