chore: use new bootstrap installer

avengineers · Apr 12, 2024 · 8508aa9 · 8508aa9
1 parent e95bdb9
commit 8508aa9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 50 deletions.
diff --git a/bootstrap.json b/bootstrap.json
diff --git a/build.ps1 b/build.ps1
@@ -46,21 +46,13 @@ function Test-RunningInCIorTestEnvironment {
 }
 
 function Invoke-Bootstrap {
-     # Download and unpack the bootstrap archive_url configured in bootstrap.json
-    $bootstrapJson = Join-Path $PSScriptRoot 'bootstrap.json'
-    if (Test-Path $bootstrapJson) {
-        $bootstrapDir = Join-Path $PSScriptRoot '.bootstrap'
-        if (-Not (Test-Path -Path $bootstrapDir)) {
-            New-Item -ItemType Directory $bootstrapDir
-        }
-        $bootstrapConfig = Get-Content $bootstrapJson | ConvertFrom-Json
-        $archiveFile = Join-Path $bootstrapDir 'bootstrap.zip'
-        Invoke-WebRequest -Uri $bootstrapConfig.archive_url -OutFile $archiveFile
-        Expand-Archive -Path $archiveFile -DestinationPath $bootstrapDir -Force
-        . $bootstrapDir\bootstrap.ps1
-    }
+    # Download bootstrap scripts from external repository
+    Invoke-RestMethod https://raw.githubusercontent.com/avengineers/bootstrap-installer/v1.5.0/install.ps1 | Invoke-Expression
+    # Execute bootstrap script
+    . .\.bootstrap\bootstrap.ps1
 }
 
+
 ## start of script
 # Always set the $InformationPreference variable to "Continue" globally, this way it gets printed on execution and continues execution afterwards.
 $InformationPreference = "Continue"

diff --git a/scoopfile.json b/scoopfile.json
@@ -1,45 +1,11 @@
 {
-    "config": {
-        "use_lessmsi": true,
-        "autostash_on_conflict": true,
-        "scoop_repo": "https://github.com/xxthunder/Scoop",
-        "scoop_branch": "develop"
-    },
     "buckets": [
         {
             "Name": "spl",
             "Source": "https://github.com/avengineers/spl-bucket"
-        },
-        {
-            "Name": "main",
-            "Source": "https://github.com/ScoopInstaller/Main"
-        },
-        {
-            "Name": "versions",
-            "Source": "https://github.com/ScoopInstaller/Versions"
-        },
-        {
-            "Name": "extras",
-            "Source": "https://github.com/ScoopInstaller/Extras"
         }
     ],
     "apps": [
-        {
-            "Source": "main",
-            "Name": "dark"
-        },
-        {
-            "Source": "main",
-            "Name": "innounp"
-        },
-        {
-            "Source": "main",
-            "Name": "lessmsi"
-        },
-        {
-            "Source": "versions",
-            "Name": "python311"
-        },
         {
             "Source": "spl",
             "Name": "mingw-winlibs-llvm-ucrt",