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

Suppress unnecessary output

Browse source
This commit is contained in:
Manuel Thalmann 2024-08-08 22:24:41 +02:00
parent 30e7c163f2
commit aa14dd7beb
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scripts/Common/Scripts/Software.ps1
View file

@ -196,9 +196,9 @@ $null = New-Module {
function Start-SoftwareInstaller {
param(
[string] $Name,
[scriptblock] $Installer = { },
[scriptblock] $Configurator = { },
[scriptblock] $UserConfigurator = { },
[scriptblock] $Installer = $null,
[scriptblock] $Configurator = $null,
[scriptblock] $UserConfigurator = $null,
[Nullable[InstallerAction]] $Action,
[hashtable] $Arguments
)
@ -236,12 +236,16 @@ $null = New-Module {
};
if ($action -eq ([InstallerAction]::Install)) {
Write-Host "Installing $Name…";
& $Installer @argumentList;
if ($Installer) {
Write-Host "Installing $Name…";
& $Installer @argumentList;
}
# ToDo: Automatically configure after installation
} elseif ($Action -eq ([InstallerAction]::Configure)) {
Write-Host "Configuring $Name…";
& $Configurator @argumentList;
if ($Configurator) {
Write-Host "Configuring $Name…";
& $Configurator @argumentList;
}
if (-not (Test-SetupUser)) {
$argumentList.Add("action", [InstallerAction]::ConfigureUser);
@ -252,8 +256,10 @@ $null = New-Module {
$argumentList.Add($userArgument, ($env:UserName));
}
Write-Host "Configuring $Name for user ``$($Arguments[$userArgument])``…";
& $UserConfigurator @argumentList;
if ($UserConfigurator) {
Write-Host "Configuring $Name for user ``$($Arguments[$userArgument])``…";
& $UserConfigurator @argumentList;
}
}
};