wip: more mac fixes for tunnel

sst · Oct 3, 2024 · 1c3ac87 · 1c3ac87
1 parent f612707
commit 1c3ac87
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/cmd/sst/mosaic/multiplexer/process.go b/cmd/sst/mosaic/multiplexer/process.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/gdamore/tcell/v2"
 	tcellterm "github.com/sst/ion/cmd/sst/mosaic/multiplexer/tcell-term"
-	"github.com/sst/ion/internal/util"
 )
 
 type vterm struct {
@@ -58,7 +57,6 @@ func (p *process) start() error {
 		p.cmd.Dir = p.dir
 	}
 	p.vt.Clear()
-	util.SetProcessGroupID(p.cmd)
 	err := p.vt.Start(p.cmd)
 	if err != nil {
 		return err

diff --git a/cmd/sst/mosaic/multiplexer/tcell-term/vt.go b/cmd/sst/mosaic/multiplexer/tcell-term/vt.go
@@ -16,7 +16,6 @@ import (
 	"github.com/creack/pty"
 	"github.com/gdamore/tcell/v2"
 	"github.com/mattn/go-runewidth"
-	"github.com/sst/ion/internal/util"
 )
 
 type (
@@ -463,9 +462,7 @@ func (vt *VT) Close() {
 	defer vt.mu.Unlock()
 	if vt.cmd != nil && vt.cmd.Process != nil {
 		slog.Info("killing process", "pid", vt.cmd.Process.Pid)
-		util.TerminateProcess(vt.cmd.Process.Pid)
-		vt.cmd.Process.Kill()
-		vt.cmd.Wait()
+		vt.cmd.Process.Signal(syscall.SIGTERM)
 		slog.Info("process killed")
 	}
 	vt.pty.Close()