mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-18 18:04:17 +00:00
fix(server): restart the dashboard through Homebrew's link after an upgrade (#816)
On a Homebrew install the dashboard runs from a versioned keg that `brew upgrade` removes, so the restart after "Update now" exec'd a deleted path. It now restarts through <prefix>/bin/skillshare, which Homebrew keeps linked to the installed version. Fixes #815
This commit is contained in:
@@ -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
|
||||
// <prefix>/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
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user