KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Also show stderr from tmux on failure

Browse Source
This commit is contained in:
Kovid Goyal 2023-04-28 20:16:37 +05:30
parent 514888a274
commit ef999c9024
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/tui/tmux.go
View File

@ -60,12 +60,14 @@ var TmuxSocketAddress = (&utils.Once[string]{Run: tmux_socket_address}).Get
func tmux_allow_passthrough() error { func tmux_allow_passthrough() error {
cmd := []string{TmuxExe(), "show", "-Ap", "allow-passthrough"} cmd := []string{TmuxExe(), "show", "-Ap", "allow-passthrough"}
c := exec.Command(cmd[0], cmd[1:]...) c := exec.Command(cmd[0], cmd[1:]...)
stderr := strings.Builder{}
c.Stderr = &stderr
allowed, not_allowed := errors.New("allowed"), errors.New("not allowed") allowed, not_allowed := errors.New("allowed"), errors.New("not allowed")
get_result := make(chan error) get_result := make(chan error)
go func() { go func() {
output, err := c.Output() output, err := c.Output()
if err != nil { if err != nil {
get_result <- fmt.Errorf("Running %s failed with error: %w", strings.Join(cmd, " "), err) get_result <- fmt.Errorf("Running %s failed with error: %w. STDERR: %s", strings.Join(cmd, " "), err, stderr.String())
} else { } else {
q := strings.TrimSpace(utils.UnsafeBytesToString(output)) q := strings.TrimSpace(utils.UnsafeBytesToString(output))
if strings.HasSuffix(q, " on") || strings.HasSuffix(q, " all") { if strings.HasSuffix(q, " on") || strings.HasSuffix(q, " all") {
@ -84,9 +86,12 @@ func tmux_allow_passthrough() error {
return r return r
} }
cmd := []string{TmuxExe(), "set", "-p", "allow-passthrough", "on"} cmd := []string{TmuxExe(), "set", "-p", "allow-passthrough", "on"}
err := exec.Command(cmd[0], cmd[1:]...).Run() c := exec.Command(cmd[0], cmd[1:]...)
stderr := strings.Builder{}
c.Stderr = &stderr
err := c.Run()
if err != nil { if err != nil {
err = fmt.Errorf("Running %s failed with error: %w", strings.Join(cmd, " "), err) err = fmt.Errorf("Running %s failed with error: %w. STDERR: %s", strings.Join(cmd, " "), err, stderr.String())
} }
return err return err
case <-time.After(2 * time.Second): case <-time.After(2 * time.Second):