Remove unpack suffixes when generating an index bundle

safing · Oct 16, 2024 · d6669ff · d6669ff
1 parent eb74b6c
commit d6669ff
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/Earthfile b/Earthfile
@@ -177,7 +177,7 @@ go-build:
     ARG GOOS=linux
     ARG GOARCH=amd64
     ARG GOARM
-    ARG CMDS=portmaster-start portmaster-core
+    ARG CMDS=portmaster-core
 
     CACHE --sharing shared "$GOCACHE"
     CACHE --sharing shared "$GOMODCACHE"

diff --git a/cmds/updatemgr/scan.go b/cmds/updatemgr/scan.go
@@ -31,15 +31,22 @@ var (
 			"**/hubs*.json",
 			"**/*mini*.mmdb.gz",
 
+			// Unsupported platforms.
+			"darwin_amd64/**",
+			"darwin_arm64/**",
+
 			// Deprecated artifacts.
+			"**/portmaster-start*",
+			"**/portmaster-app*",
+			"**/portmaster-notifier*",
+			"**/portmaster-wintoast*.dll",
+			"**/portmaster-snoretoast*.exe",
+			"**/portmaster-kext*.dll",
 			"**/profilemgr*.zip",
 			"**/settings*.zip",
 			"**/monitor*.zip",
 			"**/base*.zip",
 			"**/console*.zip",
-			"**/portmaster-wintoast*.dll",
-			"**/portmaster-snoretoast*.exe",
-			"**/portmaster-kext*.dll",
 		},
 		UnpackFiles: map[string]string{
 			"gz":  "**/*.gz",

diff --git a/service/updates/bundlegeneration.go b/service/updates/bundlegeneration.go
@@ -209,6 +209,11 @@ func GenerateBundleFromDir(bundleDir string, settings BundleFileSettings) (*Bund
 			artifact.Version = version
 		}
 
+		// Remove unpack suffix.
+		if artifact.Unpack != "" {
+			artifact.Filename, _ = strings.CutSuffix(artifact.Filename, "."+artifact.Unpack)
+		}
+
 		// Set local file path.
 		artifact.localFile = fullpath