upstream/icinga-powershell-framework
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-powershell-framework.git synced 2025-12-20 23:00:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash while trying to update with identical current and target version

Browse source 
Fixes #50
This commit is contained in:
Christian Stein 2020-03-10 17:28:22 +01:00
parent a45d0e2fbb
commit 77ebfc431f
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/core/framework/Get-IcingaPowerShellModuleArchive.psm1
View file

@ -26,7 +26,14 @@ function Get-IcingaPowerShellModuleArchive()
if ($null -ne $CurrentVersion -And $CurrentVersion -eq $Tag) { if ($null -ne $CurrentVersion -And $CurrentVersion -eq $Tag) {
Write-Host ([string]::Format('Your "{0}" is already up-to-date', $ModuleName)); Write-Host ([string]::Format('Your "{0}" is already up-to-date', $ModuleName));
return; return @{
'DownloadUrl' = $DownloadUrl;
'Version' = $Tag;
'Directory' = '';
'Archive' = '';
'ModuleRoot' = (Get-IcingaFrameworkRootPath);
'Installed' = $FALSE;
};
} }
} }
} else { } else {
@ -56,5 +63,6 @@ function Get-IcingaPowerShellModuleArchive()
'Directory' = $DownloadDirectory; 'Directory' = $DownloadDirectory;
'Archive' = $DownloadDestination; 'Archive' = $DownloadDestination;
'ModuleRoot' = (Get-IcingaFrameworkRootPath); 'ModuleRoot' = (Get-IcingaFrameworkRootPath);
'Installed' = $TRUE;
}; };
} }

6
lib/core/framework/Install-IcingaFrameworkPlugins.psm1
View file

@ -7,6 +7,12 @@ function Install-IcingaFrameworkPlugins()
$RepositoryName = 'icinga-powershell-plugins'; $RepositoryName = 'icinga-powershell-plugins';
$Archive = Get-IcingaPowerShellModuleArchive -DownloadUrl $PluginsUrl -ModuleName 'Icinga Plugins' -Repository $RepositoryName; $Archive = Get-IcingaPowerShellModuleArchive -DownloadUrl $PluginsUrl -ModuleName 'Icinga Plugins' -Repository $RepositoryName;
if ($Archive.Installed -eq $FALSE) {
return @{
'PluginUrl' = $Archive.DownloadUrl
};
}
Write-Host ([string]::Format('Installing module into "{0}"', ($Archive.Directory))); Write-Host ([string]::Format('Installing module into "{0}"', ($Archive.Directory)));
Expand-IcingaZipArchive -Path $Archive.Archive -Destination $Archive.Directory | Out-Null; Expand-IcingaZipArchive -Path $Archive.Archive -Destination $Archive.Directory | Out-Null;

6
lib/core/framework/Install-IcingaFrameworkUpdate.psm1
View file

@ -7,6 +7,12 @@ function Install-IcingaFrameworkUpdate()
$RepositoryName = 'icinga-powershell-framework'; $RepositoryName = 'icinga-powershell-framework';
$Archive = Get-IcingaPowerShellModuleArchive -DownloadUrl $FrameworkUrl -ModuleName 'Icinga Framework' -Repository $RepositoryName; $Archive = Get-IcingaPowerShellModuleArchive -DownloadUrl $FrameworkUrl -ModuleName 'Icinga Framework' -Repository $RepositoryName;
if ($Archive.Installed -eq $FALSE) {
return @{
'PluginUrl' = $Archive.DownloadUrl
};
}
Write-Host ([string]::Format('Installing module into "{0}"', ($Archive.Directory))); Write-Host ([string]::Format('Installing module into "{0}"', ($Archive.Directory)));
Expand-IcingaZipArchive -Path $Archive.Archive -Destination $Archive.Directory | Out-Null; Expand-IcingaZipArchive -Path $Archive.Archive -Destination $Archive.Directory | Out-Null;