m/fzf
1
0
Fork 0
mirror of https://github.com/junegunn/fzf.git synced 2025-11-17 15:53:39 -05:00
Code Packages Releases Wiki Activity

Update FZF_DEFAULT_COMMAND

Browse Source 
- Use bash for `set -o pipefail`
- Fall back to simpler find command when the original command failed

Related: #1061
This commit is contained in:
Junegunn Choi
2017-09-28 23:05:02 +09:00
parent 7f5f6efbac
commit ee40212e97
5 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/reader.go
View File

@@ -56,9 +56,11 @@ func (r *Reader) ReadSource() {
if util.IsTty() {
cmd := os.Getenv("FZF_DEFAULT_COMMAND")
if len(cmd) == 0 {
cmd = defaultCommand
// The default command for *nix requires bash
success = r.readFromCommand("bash", defaultCommand)
} else {
success = r.readFromCommand("sh", cmd)
}
success = r.readFromCommand(cmd)
} else {
success = r.readFromStdin()
}
@@ -100,8 +102,8 @@ func (r *Reader) readFromStdin() bool {
return true
}
func (r *Reader) readFromCommand(cmd string) bool {
listCommand := util.ExecCommand(cmd)
func (r *Reader) readFromCommand(shell string, cmd string) bool {
listCommand := util.ExecCommandWith(shell, cmd)
out, err := listCommand.StdoutPipe()
if err != nil {
return false