branch: elpa/helm
commit 45caa53090e3581fb64c00bd21979a35b3883173
Author: Thierry Volpiatto <thie...@posteo.net>
Commit: Thierry Volpiatto <thie...@posteo.net>
Fix fd executable name
---
helm-files.el | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/helm-files.el b/helm-files.el
index 31ae42b29e..a06f17a68e 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -104,7 +104,7 @@
(defvar tramp-archive-enabled)
(defvar tramp-tolerate-tilde)
(defvar password-cache)
-
+(defvar helm-fd-executable)
;;; Internal vars
;;
@@ -473,7 +473,8 @@ Remote filesystem are generally mounted with sshfs."
:type '(repeat string))
(defcustom helm-browse-project-default-find-files-fn
- (cond ((executable-find "fd")
+ (cond ((or (executable-find "fd")
+ (executable-find "fdfind"))
#'helm-browse-project-fd-find-files)
((executable-find "rg")
#'helm-browse-project-rg-find-files)
@@ -6351,10 +6352,14 @@ be directories."
(defun helm-browse-project-find-files-1 (directory program)
"List files in DIRECTORY recursively with external PROGRAM."
- (let ((cmd (cl-ecase program
- (ag "ag --hidden -g '.*' %s")
- (rg "rg --files --hidden -g '*' %s")
- (fd "fd --hidden --type f --glob '*' %s"))))
+ (require 'helm-fd)
+ (let* ((fd-exe (or helm-fd-executable
+ (executable-find "fdfind")
+ (executable-find "fd")))
+ (cmd (cl-ecase program
+ (ag "ag --hidden -g '.*' %s")
+ (rg "rg --files --hidden -g '*' %s")
+ (fd (concat fd-exe " --hidden --type f --glob '*' %s")))))
(with-temp-buffer
(call-process-shell-command
(format cmd directory)
