Merge pull request #57 from mattn/fix-56

Check ${FILES} for Windows workaround
mattn · Dec 29, 2022 · 7bfe25e · 7bfe25e
2 parents 3ac055e + 0404d9e
commit 7bfe25e
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/main.go b/main.go
@@ -708,16 +708,18 @@ func cmdGrep(c *cli.Context) error {
 		return err
 	}
 	defer f.Close()
-	files, err := f.Readdirnames(-1)
-	if err != nil || len(files) == 0 {
-		return err
-	}
-	files = filterMarkdown(files)
 	var args []string
-	for _, file := range files {
-		args = append(args, filepath.Join(cfg.MemoDir, file))
+	if strings.Index(cfg.GrepCmd, "${FILES}") != -1 {
+		files, err := f.Readdirnames(-1)
+		if err != nil || len(files) == 0 {
+			return err
+		}
+		files = filterMarkdown(files)
+		for _, file := range files {
+			args = append(args, filepath.Join(cfg.MemoDir, file))
+		}
 	}
-	if runtime.GOOS == "windows" {
+	if runtime.GOOS == "windows" && len(args) > 0 {
 		pos := 0
 		for {
 			next := pos + 20