Skip to content

Fix macosx ventura updater #768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Feb 15, 2023
Merged

Fix macosx ventura updater #768

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c124427
Upload the signed bundle to s3 (#756)
umbynos Jan 27, 2023
4af6250
add json to enable autoupdate with the new agent logic (#759)
umbynos Feb 9, 2023
f557b29
Implemented the autoupdater for MacOS
cmaglie Jan 27, 2023
3d60bed
Added more logging and fixed upgrade procedure
cmaglie Jan 31, 2023
803e4ca
Use MacOS openApplicationAtURL syscall to re-run updated app
cmaglie Feb 2, 2023
d8e770c
Bump minimum required macosx version to 10.15
cmaglie Feb 2, 2023
342e243
Removed diff-based updates
cmaglie Feb 14, 2023
a484330
Fixed update URL for different update methods
cmaglie Feb 14, 2023
599a221
fix invalid workflow
umbynos Feb 14, 2023
1c0d413
Always complete the old auto-upgrade procedure
cmaglie Feb 14, 2023
097bc2b
Moved the syscall to openApplicationAtURL inside Systray
cmaglie Feb 14, 2023
18a25e9
Added fallback restart for macosx.
cmaglie Feb 15, 2023
06e01fe
added some more logging
cmaglie Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed update URL for different update methods
  • Loading branch information
@cmaglie
cmaglie committed Feb 14, 2023
commit a484330b9c58bcee2748ff3b92b4549b8f7139f8
4 changes: 2 additions & 2 deletions updater/updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
17 changes: 15 additions & 2 deletions updater/updater_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import (
"fmt"
"io"
"os"
"runtime"

"github.com/arduino/go-paths-helper"
"github.com/codeclysm/extract/v3"
Expand All @@ -70,7 +71,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
}
Expand All @@ -88,7 +95,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 {
Expand Down
3 changes: 2 additions & 1 deletion updater/updater_default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down