Skip to content

Commit 7bfe25e

Browse files
authored
Merge pull request #57 from mattn/fix-56
Check ${FILES} for Windows workaround
2 parents 3ac055e + 0404d9e commit 7bfe25e

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

main.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -708,16 +708,18 @@ func cmdGrep(c *cli.Context) error {
708708
return err
709709
}
710710
defer f.Close()
711-
files, err := f.Readdirnames(-1)
712-
if err != nil || len(files) == 0 {
713-
return err
714-
}
715-
files = filterMarkdown(files)
716711
var args []string
717-
for _, file := range files {
718-
args = append(args, filepath.Join(cfg.MemoDir, file))
712+
if strings.Index(cfg.GrepCmd, "${FILES}") != -1 {
713+
files, err := f.Readdirnames(-1)
714+
if err != nil || len(files) == 0 {
715+
return err
716+
}
717+
files = filterMarkdown(files)
718+
for _, file := range files {
719+
args = append(args, filepath.Join(cfg.MemoDir, file))
720+
}
719721
}
720-
if runtime.GOOS == "windows" {
722+
if runtime.GOOS == "windows" && len(args) > 0 {
721723
pos := 0
722724
for {
723725
next := pos + 20

0 commit comments

Comments
 (0)