Updates with with non .zip files

janedoe-lab · Apr 29, 2021 · df33a69 · df33a69
1 parent 6b5e65d
commit df33a69
Showing 1 changed file with 23 additions and 8 deletions.
diff --git a/client/command/updates.go b/client/command/updates.go
@@ -191,36 +191,51 @@ func updateSavePath(ctx *grumble.Context) (string, error) {
 	return user.HomeDir, nil
 }
 
-func findAssetFor(prefix string, suffix string, assets []version.Asset) *version.Asset {
+func hasAnySuffix(assetFileName string, suffixes []string) bool {
+	for _, suffix := range suffixes {
+		if strings.HasSuffix(assetFileName, suffix) {
+			return true
+		}
+	}
+	return false
+}
+
+func findAssetFor(prefix string, suffixes []string, assets []version.Asset) *version.Asset {
 	for _, asset := range assets {
 		downloadURL, err := url.Parse(asset.BrowserDownloadURL)
 		if err != nil {
 			continue
 		}
 		assetFileName := filepath.Base(downloadURL.Path)
-		if strings.HasPrefix(assetFileName, prefix) && strings.HasSuffix(assetFileName, suffix) {
+		if strings.HasPrefix(assetFileName, prefix) && hasAnySuffix(assetFileName, suffixes) {
 			return &asset
 		}
 	}
 	return nil
 }
 
 func serverAssetForGOOS(assets []version.Asset) *version.Asset {
-	suffix := fmt.Sprintf("_%s.zip", runtime.GOOS)
+	suffixes := []string{fmt.Sprintf("_%s.zip", runtime.GOOS), runtime.GOOS}
 	if runtime.GOOS == "darwin" {
-		suffix = "_macos.zip"
+		suffixes = []string{"_macos.zip", "_macos"}
+		if runtime.GOARCH == "arm64" {
+			suffixes = []string{"_macos-arm64.zip", "_macos-arm64"}
+		}
 	}
 	prefix := "sliver-server"
-	return findAssetFor(prefix, suffix, assets)
+	return findAssetFor(prefix, suffixes, assets)
 }
 
 func clientAssetForGOOS(assets []version.Asset) *version.Asset {
-	suffix := fmt.Sprintf("_%s.zip", runtime.GOOS)
+	suffixes := []string{fmt.Sprintf("_%s.zip", runtime.GOOS), runtime.GOOS}
 	if runtime.GOOS == "darwin" {
-		suffix = "_macos.zip"
+		suffixes = []string{"_macos.zip", "_macos"}
+		if runtime.GOARCH == "arm64" {
+			suffixes = []string{"_macos-arm64.zip", "_macos-arm64"}
+		}
 	}
 	prefix := "sliver-client"
-	return findAssetFor(prefix, suffix, assets)
+	return findAssetFor(prefix, suffixes, assets)
 }
 
 func updateAvailable(client *http.Client, release *version.Release, saveTo string) {