From 028b744a831d21d88b07de11ae095b0d37cca12b Mon Sep 17 00:00:00 2001
From: Lightemerald <light_emerald@aostia.com>
Date: Mon, 29 Jan 2024 10:54:00 +0100
Subject: [PATCH] Changed imports

---
 setupScript.ps1 | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/setupScript.ps1 b/setupScript.ps1
index ce2ac98..25e5270 100644
--- a/setupScript.ps1
+++ b/setupScript.ps1
@@ -12,28 +12,26 @@ $scriptUrls = @(
     ($baseUrl + "setupWDAC.ps1")
 )
 
-function OldImportModules {
-    Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope Process -Force
-    foreach ($url in $ScriptUrls) {
-        $fileName = Split-Path -Leaf $url
-        $localFile = Join-Path -Path $(Join-Path $env:LOCALAPPDATA "Temp") -ChildPath $fileName
-        Write-Host "Downloading script $fileName to $localFile"
-        Invoke-WebRequest -Uri $url -OutFile $localFile -UseBasicParsing
-        Write-Host "Importing script from $localFile"
-        . $localFile
-    }
-}
+# Old ImportModules 
+#Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope Process -Force
+#foreach ($url in $ScriptUrls) {
+#    $fileName = Split-Path -Leaf $url
+#    $localFile = Join-Path -Path $(Join-Path $env:LOCALAPPDATA "Temp") -ChildPath $fileName
+#    Write-Host "Downloading script $fileName to $localFile"
+#    Invoke-WebRequest -Uri $url -OutFile $localFile -UseBasicParsing
+#    Write-Host "Importing script from $localFile"
+#    . $localFile
+#}
 
-function ImportModules {
-    Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope Process -Force
-    foreach ($ScriptUrl in $ScriptUrls) {
-        try {
-            Write-Host "Importing script from $ScriptUrl"
-            $scriptContent = Invoke-RestMethod $ScriptUrl
-            Invoke-Expression $scriptContent
-        } catch {
-            Write-Error "Error importing script from $ScriptUrl. Error: $_"
-        }
+# New ImportModules
+Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope Process -Force
+foreach ($ScriptUrl in $ScriptUrls) {
+    try {
+        Write-Host "Importing script from $ScriptUrl"
+        $scriptContent = Invoke-RestMethod $ScriptUrl
+        Invoke-Expression $scriptContent
+    } catch {
+        Write-Error "Error importing script from $ScriptUrl. Error: $_"
     }
 }