From e79d479ba18280233b7ab8abf4fc408d3aba3b24 Mon Sep 17 00:00:00 2001 From: Lightemerald Date: Mon, 6 Nov 2023 11:07:42 +0100 Subject: [PATCH] Fix9 --- setupScript.ps1 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/setupScript.ps1 b/setupScript.ps1 index ca482c0..8917942 100644 --- a/setupScript.ps1 +++ b/setupScript.ps1 @@ -4,16 +4,18 @@ function Import-ScriptsFromUrls { [string] $LocalPath ) + $scripts = @() + foreach ($url in $ScriptUrls) { $fileName = Split-Path -Leaf $url $localFile = Join-Path -Path $LocalPath -ChildPath $fileName Write-Host "Downloading script from $url to $localFile" Invoke-WebRequest -Uri $url -OutFile $localFile -UseBasicParsing Write-Host "Importing script from $localFile" - # allow running scripts - Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope Process - . $localFile + $scripts += $localFile } + + return $scripts } $baseUrl = "https://git.justw.tf/Lightemerald/setup-script/raw/branch/main/" @@ -27,7 +29,12 @@ $scriptUrls = @( ($baseUrl + "setupUpdate.ps1") ) -Import-ScriptsFromUrls -ScriptUrls $scriptUrls -LocalPath (Join-Path $env:LOCALAPPDATA "Temp") +$scripts = Import-ScriptsFromUrls -ScriptUrls $scriptUrls -LocalPath (Join-Path $env:LOCALAPPDATA "Temp") +Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope Process +foreach ($script in $scripts) { + . $script +} + function Setup { param (