Kill preexisting sshcode remote process for a user

coder · May 2, 2019 · 2f80f3f · 2f80f3f
1 parent 804c11e
commit 2f80f3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/sshcode.go b/sshcode.go
@@ -321,12 +321,14 @@ func downloadScript(codeServerPath string) string {
 	return fmt.Sprintf(
 		`set -euxo pipefail || exit 1
 
+pkill -f %v || true
 mkdir -p ~/.local/share/code-server %v
 cd %v
 wget -N https://codesrv-ci.cdr.sh/latest-linux
 [ -f %v ] && rm %v
 ln latest-linux %v
 chmod +x %v`,
+		codeServerPath,
 		filepath.Dir(codeServerPath),
 		filepath.Dir(codeServerPath),
 		codeServerPath,

diff --git a/sshcode_test.go b/sshcode_test.go
@@ -40,7 +40,7 @@ func TestSSHCode(t *testing.T) {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		err := sshCode("127.0.0.1", "", options{
+		err := sshCode("foo@127.0.0.1", "", options{
 			sshFlags:   testSSHArgs(sshPort),
 			localPort:  localPort,
 			remotePort: remotePort,