diff --git a/profiles/DerGeret/Windows/Setup.ps1 b/profiles/DerGeret/Windows/Setup.ps1 index 9ed9bcf7..731346f8 100644 --- a/profiles/DerGeret/Windows/Setup.ps1 +++ b/profiles/DerGeret/Windows/Setup.ps1 @@ -1,6 +1,6 @@ #!/bin/pwsh $env:WIN_COMPUTER_NAME = "DerGeret"; -$env:SETUP_SCRIPT_NAME = [System.IO.Path]::GetRelativePath("$PSScriptRoot/../../..", "$PSScriptRoot/Restore.ps1"); +$env:SETUP_SCRIPT_NAME = "$PSScriptRoot/Restore.ps1"; $Global:SetupConfigPostprocessor = { param([xml] $config, [System.Xml.XmlNamespaceManager] $namespace) diff --git a/profiles/Generic/Windows/Setup.ps1 b/profiles/Generic/Windows/Setup.ps1 index a0658739..78d0f3e8 100644 --- a/profiles/Generic/Windows/Setup.ps1 +++ b/profiles/Generic/Windows/Setup.ps1 @@ -1,5 +1,5 @@ #!/bin/pwsh $env:WIN_COMPUTER_NAME ??= "win11"; -$env:SETUP_SCRIPT_NAME ??= [System.IO.Path]::GetRelativePath("$PSScriptRoot/../../..", "$PSScriptRoot/Install.ps1"); +$env:SETUP_SCRIPT_NAME ??= "$PSScriptRoot/Install.ps1"; . "$PSScriptRoot/../../../scripts/Windows/OS/Setup.ps1"; diff --git a/profiles/KVM/Windows/Setup.ps1 b/profiles/KVM/Windows/Setup.ps1 index 30157671..6566ae50 100644 --- a/profiles/KVM/Windows/Setup.ps1 +++ b/profiles/KVM/Windows/Setup.ps1 @@ -1,4 +1,4 @@ #!/bin/pwsh -$env:SETUP_SCRIPT_NAME ??= [System.IO.Path]::GetRelativePath("$PSScriptRoot/../../..", "$PSScriptRoot/Install.ps1"); +$env:SETUP_SCRIPT_NAME ??= "$PSScriptRoot/Install.ps1"; . "$PSScriptRoot/../../Generic/Windows/Setup.ps1"; diff --git a/scripts/Windows/OS/Setup.ps1 b/scripts/Windows/OS/Setup.ps1 index 63c1b733..47ff0ce8 100644 --- a/scripts/Windows/OS/Setup.ps1 +++ b/scripts/Windows/OS/Setup.ps1 @@ -37,7 +37,7 @@ $newCommand = $installationCommand.ParentNode.AppendChild($installationCommand.C $newCommand.SelectSingleNode("./ua:CommandLine", $namespace).InnerText = ` "powershell -Command " + ` $(Get-Content "$PSScriptRoot/InitialBoot.ps1") + ` - "; pwsh '$env:SETUP_SCRIPT_NAME';"; + "; pwsh '$([System.IO.Path]::GetRelativePath("$PSScriptRoot/../../..", $env:SETUP_SCRIPT_NAME))';"; $order = [int]$newCommand.SelectSingleNode("./ua:Order", $namespace).InnerText; $newCommand.SelectSingleNode("./ua:Order", $namespace).InnerText = $order + 1;