Skip to content
This repository was archived by the owner on Jan 17, 2021. It is now read-only.

Commit b20b1f9

Browse files
committed
Fixes requested by nhooyr software™
1 parent 91070f9 commit b20b1f9

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

main.go

+10-11
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ chmod +x ~/bin/code-server
4747
)
4848
output, err := sshCmd.CombinedOutput()
4949
if err != nil {
50-
flog.Fatal("failed to update code-server: %v: %s", err, string(output))
50+
flog.Fatal("failed to update code-server: %v: %s", err, output)
5151
}
5252

5353
flog.Info("starting code-server...")
@@ -72,20 +72,12 @@ chmod +x ~/bin/code-server
7272
flog.Fatal("failed to start code-server: %v", err)
7373
}
7474

75-
var openCmd *exec.Cmd
7675
url := "http://127.0.0.1:" + localPort
77-
if commandExists("google-chrome") {
78-
openCmd = exec.Command("google-chrome", "--app="+url, "--disable-extensions", "--disable-plugins")
79-
} else if commandExists("firefox") {
80-
openCmd = exec.Command("firefox", "--url="+url, "-safe-mode")
81-
}
82-
8376
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
8477
defer cancel()
8578
for {
86-
err := ctx.Err()
87-
if err != nil {
88-
flog.Fatal("code-server didn't start in time %v", err)
79+
if ctx.Err() != nil {
80+
flog.Fatal("code-server didn't start in time %v", ctx.Err())
8981
}
9082
// Waits for code-server to be available before opening the browser.
9183
r, _ := http.NewRequest("GET", url, nil)
@@ -98,6 +90,13 @@ chmod +x ~/bin/code-server
9890
break
9991
}
10092

93+
var openCmd *exec.Cmd
94+
if commandExists("google-chrome") {
95+
openCmd = exec.Command("google-chrome", "--app="+url, "--disable-extensions", "--disable-plugins")
96+
} else if commandExists("firefox") {
97+
openCmd = exec.Command("firefox", "--url="+url, "-safe-mode")
98+
}
99+
101100
err = openCmd.Start()
102101
if err != nil {
103102
flog.Fatal("failed to open browser: %v", err)

0 commit comments

Comments
 (0)