Skip to content

Commit f34d524

Browse files
miles170bbatsov
authored andcommitted
[Fix #1853] projectile-generic-command should use projectile-fd-executable to find the path for fd
1 parent 0ad8262 commit f34d524

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
* Fix `fd` inserting color control sequences when used over tramp.
2525
* [#1835](https://github.com/bbatsov/projectile/issues/1835): Reopening existing vterm buffer in other window
26+
* [#1865](https://github.com/bbatsov/projectile/pull/1865): `projectile-generic-command` should use `projectile-fd-executable` to find the path for fd.
2627

2728
## 2.7.0 (2022-11-22)
2829

projectile.el

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -756,11 +756,8 @@ Set to nil to disable listing submodules contents."
756756
(cond
757757
;; we prefer fd over find
758758
;; note that --strip-cwd-prefix is only available in version 8.3.0+
759-
((executable-find "fd")
760-
"fd . -0 --type f --color=never --strip-cwd-prefix")
761-
;; fd's executable is named fdfind is some Linux distros (e.g. Ubuntu)
762-
((executable-find "fdfind")
763-
"fdfind . -0 --type f --color=never --strip-cwd-prefix")
759+
(projectile-fd-executable
760+
(format "%s . -0 --type f --color=never --strip-cwd-prefix" projectile-fd-executable))
764761
;; with find we have to be careful to strip the ./ from the paths
765762
;; see https://stackoverflow.com/questions/2596462/how-to-strip-leading-in-unix-find
766763
(t "find . -type f | cut -c3- | tr '\\n' '\\0'"))

0 commit comments

Comments
 (0)