From 46ab70b3d4b6fbc72970d1421153dfa5f23bd492 Mon Sep 17 00:00:00 2001
From: Lightemerald <light_emerald@aostia.com>
Date: Mon, 6 Nov 2023 10:35:04 +0100
Subject: [PATCH] Fix4

---
 setupScript.ps1 | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/setupScript.ps1 b/setupScript.ps1
index cf0410e..df8800d 100644
--- a/setupScript.ps1
+++ b/setupScript.ps1
@@ -1,14 +1,21 @@
 function Import-ScriptsFromUrls {
     param (
-        [string[]] $ScriptUrls
+        [string[]] $ScriptUrls,
+        [string] $LocalPath
     )
 
     foreach ($url in $ScriptUrls) {
-        Write-Host "Importing script from $url"
-        Invoke-Expression (Invoke-WebRequest -Uri $url -UseBasicParsing).Content
+        $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
+        Write-Host "Importing script from $localFile"
+        . $localFile
     }
 }
+
 $baseUrl = "https://git.justw.tf/Lightemerald/setup-script/raw/branch/main/"
+$localPath = "C:\setup-scripts"
 $scriptUrls = @(
     ($baseUrl + "setupTmp.ps1"),
     ($baseUrl + "setupOffice.ps1"),
@@ -19,6 +26,7 @@ $scriptUrls = @(
     ($baseUrl + "setupUpdate.ps1")
 )
 
+Import-ScriptsFromUrls -ScriptUrls $scriptUrls -LocalPath $localPath
 Import-ScriptsFromUrls -ScriptUrls $scriptUrls
 
 function Setup {