Changed imports

setupScript.ps1

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