Revert behavior using DISPLAY to open app window

Revert behavior using DISPLAY to open app window · coder/sshcode@60b72fe

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

File tree

lines changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ const codeServerPath = "~/.cache/sshcode/sshcode-server"`
`24`	`24`	`type options struct {`
`25`	`25`	`skipSync bool`
`26`	`26`	`syncBack bool`
	`27`	`+noOpen bool`
`27`	`28`	`localPort string`
`28`	`29`	`remotePort string`
`29`	`30`	`sshFlags string`
`@@ -130,7 +131,7 @@ func sshCode(host, dir string, o options) error {`
`130`	`131`
`131`	`132`	`ctx, cancel = context.WithCancel(context.Background())`
`132`	`133`
`133`		`-if os.Getenv("DISPLAY") != "" {`
	`134`	`+if !o.noOpen {`
`134`	`135`	`openBrowser(url)`
`135`	`136`	`}`
`136`	`137`

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ import (`
`6`	`6`	`"io"`
`7`	`7`	`"net"`
`8`	`8`	`"net/http"`
`9`		`-"os"`
`10`	`9`	`"os/exec"`
`11`	`10`	`"path/filepath"`
`12`	`11`	`"strconv"`
`@@ -20,10 +19,6 @@ import (`
`20`	`19`	`)`
`21`	`20`
`22`	`21`	`func TestSSHCode(t *testing.T) {`
`23`		`-// Avoid opening a browser window.`
`24`		`-err := os.Unsetenv("DISPLAY")`
`25`		`-require.NoError(t, err)`
`26`		`-`
`27`	`22`	`sshPort, err := randomPort()`
`28`	`23`	`require.NoError(t, err)`
`29`	`24`
`@@ -44,6 +39,7 @@ func TestSSHCode(t *testing.T) {`
`44`	`39`	`sshFlags: testSSHArgs(sshPort),`
`45`	`40`	`localPort: localPort,`
`46`	`41`	`remotePort: remotePort,`
	`42`	`+noOpen: true,`
`47`	`43`	`})`
`48`	`44`	`require.NoError(t, err)`
`49`	`45`	`}()`