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

DRYer

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

21
tools/tui/tmux.go
View File

@ -57,17 +57,21 @@ func tmux_socket_address() (socket string) {
var TmuxSocketAddress = (&utils.Once[string]{Run: tmux_socket_address}).Get var TmuxSocketAddress = (&utils.Once[string]{Run: tmux_socket_address}).Get
func tmux_command(args ...string) (c *exec.Cmd, stderr *strings.Builder) {
c = exec.Command(TmuxExe(), args...)
stderr = &strings.Builder{}
c.Stderr = stderr
return c, stderr
}
func tmux_allow_passthrough() error { func tmux_allow_passthrough() error {
cmd := []string{TmuxExe(), "show", "-Ap", "allow-passthrough"} c, stderr := tmux_command("show", "-Ap", "allow-passthrough")
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. STDERR: %s", strings.Join(cmd, " "), err, stderr.String()) get_result <- fmt.Errorf("Running %#v failed with error: %w. STDERR: %s", c.Args, 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") {
@ -85,13 +89,10 @@ func tmux_allow_passthrough() error {
if r != not_allowed { if r != not_allowed {
return r return r
} }
cmd := []string{TmuxExe(), "set", "-p", "allow-passthrough", "on"} c, stderr = tmux_command("set", "-p", "allow-passthrough", "on")
c := exec.Command(cmd[0], cmd[1:]...)
stderr := strings.Builder{}
c.Stderr = &stderr
err := c.Run() err := c.Run()
if err != nil { if err != nil {
err = fmt.Errorf("Running %s failed with error: %w. STDERR: %s", strings.Join(cmd, " "), err, stderr.String()) err = fmt.Errorf("Running %#v failed with error: %w. STDERR: %s", c.Args, err, stderr.String())
} }
return err return err
case <-time.After(2 * time.Second): case <-time.After(2 * time.Second):