diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2024-09-22 00:31:11 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2024-09-29 19:33:42 +0900 |
| commit | 4161403a1d6286f6ba7898b1f22f30d01d85b8dc (patch) | |
| tree | 539b7b985c0b9afe681f6cd60e2d37b0415f00a2 /src/proxy_windows.go | |
| parent | 53bcdc4294540fa8d927a5532cc7ac0aa58e3487 (diff) | |
| download | fzf-4161403a1d6286f6ba7898b1f22f30d01d85b8dc.tar.gz | |
--tmux: Export bash functions
Fix #4001
Diffstat (limited to 'src/proxy_windows.go')
| -rw-r--r-- | src/proxy_windows.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/proxy_windows.go b/src/proxy_windows.go index a957da8a..2aa61ab7 100644 --- a/src/proxy_windows.go +++ b/src/proxy_windows.go @@ -13,12 +13,16 @@ import ( var shPath atomic.Value -func sh() (string, error) { +func sh(bash bool) (string, error) { if cached := shPath.Load(); cached != nil { return cached.(string), nil } - cmd := exec.Command("cygpath", "-w", "/usr/bin/sh") + name := "sh" + if bash { + name = "bash" + } + cmd := exec.Command("cygpath", "-w", "/usr/bin/"+name) bytes, err := cmd.Output() if err != nil { return "", err @@ -31,7 +35,7 @@ func sh() (string, error) { func mkfifo(path string, mode uint32) (string, error) { m := strconv.FormatUint(uint64(mode), 8) - sh, err := sh() + sh, err := sh(false) if err != nil { return path, err } @@ -43,7 +47,7 @@ func mkfifo(path string, mode uint32) (string, error) { } func withOutputPipe(output string, task func(io.ReadCloser)) error { - sh, err := sh() + sh, err := sh(false) if err != nil { return err } @@ -62,7 +66,7 @@ func withOutputPipe(output string, task func(io.ReadCloser)) error { } func withInputPipe(input string, task func(io.WriteCloser)) error { - sh, err := sh() + sh, err := sh(false) if err != nil { return err } |
