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

Fix installer script structure

Browse source
This commit is contained in:
Manuel Thalmann 2024-08-01 23:34:35 +02:00
parent 34108f78d8
commit 1c29cdd89c
2 changed files with 52 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/Windows/Scripts/Software.ps1
View file

@ -1,10 +1,6 @@
. "$PSScriptRoot/Config.ps1";
. "$PSScriptRoot/../Types/InstallerAction.ps1";
$null = New-Module {
. "$PSScriptRoot/../Types/InstallerAction.ps1";
$userArgument = "name";
<#
.SYNOPSIS
Gets the name of the software.
@ -45,6 +41,10 @@ $null = New-Module {
)
}
$null = New-Module {
. "$PSScriptRoot/../Types/InstallerAction.ps1";
$userArgument = "name";
function Start-SoftwareInstaller {
param(
[InstallerAction] $Action,
@ -68,7 +68,6 @@ $null = New-Module {
foreach ($user in Get-Users) {
$Arguments.Add($userArgument, $user);
Start-SoftwareInstaller -Action ([InstallerAction]::ConfigureUser) @Arguments;
}
} elseif ($action -eq ([InstallerAction]::ConfigureUser)) {

14
scripts/Windows/Software/winget/Manage.ps1
View file

@ -1,9 +1,19 @@
param(
[string] $Action = ([InstallerAction]::Install),
$Action,
[hashtable] $Arguments
)
. "$PSScriptRoot/../../Scripts/Software.ps1";
. "$PSScriptRoot/../../Types/InstallerAction.ps1";
function Install-Winget {
param(
[InstallerAction] $Action = [InstallerAction]::Install,
[hashtable] $Arguments
)
Start-SoftwareInstaller -Action $Action -Arguments $Arguments;
}
function Install-Software {
$xamlDownloadLink = "https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.6/Microsoft.UI.Xaml.2.8.x64.appx";
@ -17,4 +27,4 @@ function Install-Software {
Remove-Item $file;
}
Start-SoftwareInstaller -Action $Action -Arguments $Arguments;
Install-Winget @PSBoundParameters;