mirror of
https://github.com/Dvorinka/Containr.git
synced 2026-10-28 07:41:27 +00:00
fix(cli): gate SIGWINCH resize watch behind unix build tag (#55)
syscall.SIGWINCH does not exist on Windows, breaking the release cross-compile for windows/amd64. Generated with [Devin](https://devin.ai) Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
1 parent
ae7e6b4991
commit
401daf69aa
3 files changed
+44
-15
No files matched your search
@@ -4,9 +4,7 @@ import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"os"
|
||||
"os/signal"
|
||||
"strings"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/gorilla/websocket"
|
||||
@@ -44,20 +42,13 @@ var ShellCmd = &cobra.Command{
|
||||
if err == nil {
|
||||
defer term.Restore(fd, oldState)
|
||||
}
|
||||
if w, h, err := term.GetSize(fd); err == nil {
|
||||
_ = conn.WriteJSON(map[string]interface{}{"type": "resize", "cols": w, "rows": h})
|
||||
}
|
||||
// Forward SIGWINCH resizes.
|
||||
sigCh := make(chan os.Signal, 1)
|
||||
signal.Notify(sigCh, syscall.SIGWINCH)
|
||||
defer signal.Stop(sigCh)
|
||||
go func() {
|
||||
for range sigCh {
|
||||
if w, h, err := term.GetSize(fd); err == nil {
|
||||
_ = conn.WriteJSON(map[string]interface{}{"type": "resize", "cols": w, "rows": h})
|
||||
}
|
||||
sendSize := func() {
|
||||
if w, h, err := term.GetSize(fd); err == nil {
|
||||
_ = conn.WriteJSON(map[string]interface{}{"type": "resize", "cols": w, "rows": h})
|
||||
}
|
||||
}()
|
||||
}
|
||||
sendSize()
|
||||
defer watchResize(sendSize)()
|
||||
}
|
||||
|
||||
done := make(chan struct{})
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
//go:build !windows
|
||||
|
||||
package commands
|
||||
|
||||
import (
|
||||
"os"
|
||||
"os/signal"
|
||||
"syscall"
|
||||
)
|
||||
|
||||
// watchResize forwards SIGWINCH events to send. Returns a stop func.
|
||||
func watchResize(send func()) func() {
|
||||
sigCh := make(chan os.Signal, 1)
|
||||
signal.Notify(sigCh, syscall.SIGWINCH)
|
||||
done := make(chan struct{})
|
||||
go func() {
|
||||
for {
|
||||
select {
|
||||
case <-sigCh:
|
||||
send()
|
||||
case <-done:
|
||||
return
|
||||
}
|
||||
}
|
||||
}()
|
||||
return func() {
|
||||
signal.Stop(sigCh)
|
||||
close(done)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
//go:build windows
|
||||
|
||||
package commands
|
||||
|
||||
// watchResize is a no-op on Windows — console resize events don't map to a
|
||||
// signal. The initial size is still sent, and Windows Terminal resize is rare
|
||||
// enough to accept stale dimensions for now.
|
||||
func watchResize(send func()) func() { return func() {} }
|
||||
Reference in new issue
Block a user