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

Ensure the environment variables are always set properly

Browse source
This commit is contained in:
Manuel Thalmann 2024-08-05 23:09:58 +02:00
parent 2bb3007006
commit 901262b8a7
3 changed files with 60 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/Windows/OS/Install.ps1
View file

@ -4,6 +4,7 @@
. "$PSScriptRoot/Manage.ps1"; . "$PSScriptRoot/Manage.ps1";
. "$PSScriptRoot/User/Install.ps1"; . "$PSScriptRoot/User/Install.ps1";
. "$PSScriptRoot/../Scripts/Context.ps1"; . "$PSScriptRoot/../Scripts/Context.ps1";
. "$PSScriptRoot/../Scripts/Operations.ps1";
. "$PSScriptRoot/../Software/Firefox/Install.ps1"; . "$PSScriptRoot/../Software/Firefox/Install.ps1";
$null = New-Module { $null = New-Module {
@ -18,14 +19,9 @@ $null = New-Module {
Finishes the installation of a running Windows machine. Finishes the installation of a running Windows machine.
#> #>
function Start-WindowsInstallation { function Start-WindowsInstallation {
$ErrorActionPreference = 'Inquire'; Start-Operation {
$env:WSLENV = "CONFIG_MODULE/p";
if ($env:CONFIG_MODULE) {
$env:CONFIG_MODULE = Resolve-Path $env:CONFIG_MODULE;
}
Start-InstallationLoop; Start-InstallationLoop;
};
} }
<# <#

14
scripts/Windows/Scripts/Operations.ps1 Normal file
View file

@ -0,0 +1,14 @@
function Start-Operation {
param(
[scriptblock] $Action
)
$ErrorActionPreference = 'Inquire';
$env:WSLENV = "CONFIG_MODULE/p";
if ($env:CONFIG_MODULE) {
$env:CONFIG_MODULE = Resolve-Path $env:CONFIG_MODULE;
}
& $Action;
}

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

@ -1,4 +1,5 @@
. "$PSScriptRoot/Config.ps1"; . "$PSScriptRoot/Config.ps1";
. "$PSScriptRoot/Operations.ps1";
. "$PSScriptRoot/../Types/InstallerAction.ps1"; . "$PSScriptRoot/../Types/InstallerAction.ps1";
$null = New-Module { $null = New-Module {
@ -15,6 +16,7 @@ $null = New-Module {
[hashtable] $Arguments [hashtable] $Arguments
) )
Start-Operation {
if (-not $Name) { if (-not $Name) {
$Name = Split-Path -Leaf (Split-Path -Parent ((Get-PSCallStack)[1].ScriptName)); $Name = Split-Path -Leaf (Split-Path -Parent ((Get-PSCallStack)[1].ScriptName));
} }
@ -61,5 +63,6 @@ $null = New-Module {
}; };
& $installHandler -Action $Action -Arguments $Arguments; & $installHandler -Action $Action -Arguments $Arguments;
};
} }
} }