manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Prevent unnecessary installation actions

Browse source
This commit is contained in:
Manuel Thalmann 2024-08-27 01:57:46 +02:00
parent 9ba134d202
commit f25e892faf
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/Common/Software/PowerShell/Module.ps1
View file

@ -34,7 +34,14 @@ $null = New-Module {
) )
$env:PENDING_MODULE_NAME = $Arguments.Name; $env:PENDING_MODULE_NAME = $Arguments.Name;
$installAction = { Install-Module -Scope AllUsers -Force $env:PENDING_MODULE_NAME @args };
$installAction = {
$module = $env:PENDING_MODULE_NAME;
if (-not (Get-Module -ListAvailable $module -ErrorAction SilentlyContinue)) {
Install-Module -Scope AllUsers -Force $module @args;
}
};
if (-not $Arguments.NativeOnly) { if (-not $Arguments.NativeOnly) {
& $installAction -AcceptLicense; & $installAction -AcceptLicense;

17
scripts/Windows/Software/PinnedItem/Manage.ps1
View file

@ -20,12 +20,15 @@ Start-SoftwareInstaller @parameters -Installer {
[hashtable] $Arguments [hashtable] $Arguments
) )
$feature = "NetFx3"; $module = $Arguments.Name;
if ((Get-WindowsOptionalFeature -Online -FeatureName $feature).State -ne "Enabled") {
Write-Host "Enabling ``$feature`` feature…";
choco install --source windowsFeatures -y $feature;
}
& $Arguments.Installer @PSBoundParameters; & $Arguments.Installer @PSBoundParameters;
if (-not (& { powershell -NoProfile -Command "Import-Module $module; exit ([bool]`$Error)" 2> $null; $?; })) {
$feature = "NetFx3";
if ((Get-WindowsOptionalFeature -Online -FeatureName $feature).State -ne "Enabled") {
Write-Host "Enabling ``$feature`` feature…";
choco install --source windowsFeatures -y $feature;
}
}
} }