@@ -47,7 +47,7 @@ chmod +x ~/bin/code-server
47
47
)
48
48
output , err := sshCmd .CombinedOutput ()
49
49
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 )
51
51
}
52
52
53
53
flog .Info ("starting code-server..." )
@@ -72,20 +72,12 @@ chmod +x ~/bin/code-server
72
72
flog .Fatal ("failed to start code-server: %v" , err )
73
73
}
74
74
75
- var openCmd * exec.Cmd
76
75
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
-
83
76
ctx , cancel := context .WithTimeout (context .Background (), 3 * time .Second )
84
77
defer cancel ()
85
78
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 ())
89
81
}
90
82
// Waits for code-server to be available before opening the browser.
91
83
r , _ := http .NewRequest ("GET" , url , nil )
@@ -98,6 +90,13 @@ chmod +x ~/bin/code-server
98
90
break
99
91
}
100
92
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
+
101
100
err = openCmd .Start ()
102
101
if err != nil {
103
102
flog .Fatal ("failed to open browser: %v" , err )
0 commit comments