diff --git a/internal/server/handler_restart_upgrade.go b/internal/server/handler_restart_upgrade.go index cbb1fc74a..36aab09a7 100644 --- a/internal/server/handler_restart_upgrade.go +++ b/internal/server/handler_restart_upgrade.go @@ -168,7 +168,7 @@ func defaultStartUIRestartHelper(args []string, dir string) error { if err != nil { return err } - cmd := exec.Command(exe, args...) + cmd := exec.Command(restartExecutable(exe), args...) cmd.Stdout = nil cmd.Stderr = nil cmd.Stdin = nil @@ -181,6 +181,18 @@ func defaultStartUIRestartHelper(args []string, dir string) error { return cmd.Process.Release() } +// restartExecutable returns the binary that starts the restarted dashboard. +// A Homebrew binary runs from a versioned Cellar keg that `brew upgrade` +// deletes, so it restarts through the link Homebrew keeps at +// /bin/skillshare, which points at the installed version. +func restartExecutable(exe string) string { + if versioncheck.DetectInstallMethod(exe) != versioncheck.InstallBrew { + return exe + } + prefix, _, _ := strings.Cut(exe, "/Cellar/") + return prefix + "/bin/skillshare" +} + func restartRequestAllowed(r *http.Request, serverAddr string) bool { if r.Header.Get("Sec-Fetch-Site") == "cross-site" { return false diff --git a/internal/server/handler_restart_upgrade_test.go b/internal/server/handler_restart_upgrade_test.go index 52503c9df..8d51a5579 100644 --- a/internal/server/handler_restart_upgrade_test.go +++ b/internal/server/handler_restart_upgrade_test.go @@ -24,6 +24,27 @@ func TestUIRestartHelperArgsPreservesAddressBasePathAndMode(t *testing.T) { } } +func TestRestartExecutable(t *testing.T) { + tests := []struct { + name string + exe string + want string + }{ + {"linuxbrew keg", "/home/linuxbrew/.linuxbrew/Cellar/skillshare/0.28.4/bin/skillshare", "/home/linuxbrew/.linuxbrew/bin/skillshare"}, + {"apple silicon keg", "/opt/homebrew/Cellar/skillshare/0.30.0/bin/skillshare", "/opt/homebrew/bin/skillshare"}, + {"intel keg", "/usr/local/Cellar/skillshare/0.30.0/bin/skillshare", "/usr/local/bin/skillshare"}, + {"homebrew link", "/opt/homebrew/bin/skillshare", "/opt/homebrew/bin/skillshare"}, + {"direct install", "/home/user/.local/bin/skillshare", "/home/user/.local/bin/skillshare"}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := restartExecutable(tt.exe); got != tt.want { + t.Fatalf("restartExecutable(%q) = %q, want %q", tt.exe, got, tt.want) + } + }) + } +} + func TestRestartRequestAllowedRejectsCrossSite(t *testing.T) { req := httptest.NewRequest(http.MethodPost, "/api/restart", strings.NewReader(`{}`)) req.RemoteAddr = "203.0.113.10:1234"