Fixed update URL for different update methods

Author: cmaglie

updater/updater.go

@@ -44,8 +44,8 @@ const (
 	plat = runtime.GOOS + "-" + runtime.GOARCH
 )
 
-func fetchInfo(updateAPIURL string, cmdName string) (*availableUpdateInfo, error) {
-	r, err := fetch(updateAPIURL + cmdName + "/" + plat + ".json")
+func fetchInfo(updateAPIURL string) (*availableUpdateInfo, error) {
+	r, err := fetch(updateAPIURL)
 	if err != nil {
 		return nil, err
 	}

updater/updater_darwin.go

@@ -70,7 +70,13 @@ func checkForUpdates(currentVersion string, updateURL string, cmdName string) (s
 	}
 
 	// Fetch information about updates
-	info, err := fetchInfo(updateURL, cmdName)
+
+	// updateURL: "https://downloads.arduino.cc/"
+	// cmdName: "CreateAgent/Stable"
+	// plat: "darwin-amd64"
+	// info URL: "https://downloads.arduino.cc/CreateAgent/Stable/darwin-amd64-bundle.json"
+	infoURL := updateURL + cmdName + "/" + plat + "-bundle.json"
+	info, err := fetchInfo(infoURL)
 	if err != nil {
 		return "", err
 	}
@@ -88,7 +94,13 @@ func checkForUpdates(currentVersion string, updateURL string, cmdName string) (s
 	defer tmp.RemoveAll()
 
 	// Download the update.
-	downloadURL := updateURL + cmdName + "/" + info.Version + "/ArduinoCreateAgent.app_notarized.zip"
+
+	// updateURL: "https://downloads.arduino.cc/"
+	// cmdName == "CreateAgent/Stable"
+	// info.Version == "1.2.8"
+	// runtime.GOARCH: "amd64"
+	// downloadURL: "https://downloads.arduino.cc/CreateAgent/Stable/1.2.8/ArduinoCreateAgent.app_arm64_notarized.zip"
+	downloadURL := updateURL + cmdName + "/" + info.Version + "/ArduinoCreateAgent.app_" + runtime.GOARCH + "_notarized.zip"
 	logrus.WithField("url", downloadURL).Info("Downloading update")
 	download, err := fetch(downloadURL)
 	if err != nil {

updater/updater_default.go

@@ -225,7 +225,8 @@ func (u *Updater) update() error {
 	}
 	defer old.Close()
 
-	info, err := fetchInfo(u.UpdateURL, u.CmdName)
+	infoURL := u.UpdateURL + u.CmdName + "/" + plat + ".json"
+	info, err := fetchInfo(infoURL)
 	if err != nil {
 		log.Println(err)
 		return err