Don't add an extraneous slash in remote PATH list in Eshell

Previously, in a remote directory, '(eshell-get-path)' would return a
list of strings like "/ssh:localhost://usr/bin".  While that shouldn't
break most things, it's not strictly correct either.  See bug#65551.

* lisp/eshell/esh-util.el (eshell-get-path): Use 'concat' instead of
'file-name-concat'.

* test/lisp/eshell/esh-util-tests.el: Require 'tramp' and
'eshell-tests-helpers'.
(esh-util-test/path/get, eshell-util-test/path/get-remote): New tests.

diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index d003148dc96a88d5a00a733ab9cac6325416917b..6fe260cbb46c948525e3a8f1e36bbb6a7b2eea11 100644 (file)
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -283,7 +283,7 @@ as the $PATH was actually specified."
                  (eshell-under-windows-p))
         (push "." path))
       (if (and remote (not literal-p))
-          (mapcar (lambda (x) (file-name-concat remote x)) path)
+          (mapcar (lambda (x) (concat remote x)) path)
         path))))
 
 (defun eshell-set-path (path)

diff --git a/test/lisp/eshell/esh-util-tests.el b/test/lisp/eshell/esh-util-tests.el
index afaf1b77f2bb2f93a32cf6fc3a5ac252674841d9..9546a4a62fdc69d31d99bf9a7ba2f89f62a9ac66 100644 (file)
--- a/test/lisp/eshell/esh-util-tests.el
+++ b/test/lisp/eshell/esh-util-tests.el
@@ -19,9 +19,15 @@
 
 ;;; Code:
 
+(require 'tramp)
 (require 'ert)
 (require 'esh-util)
 
+(require 'eshell-tests-helpers
+         (expand-file-name "eshell-tests-helpers"
+                           (file-name-directory (or load-file-name
+                                                    default-directory))))
+
 ;;; Tests:
 
 (ert-deftest esh-util-test/eshell-stringify/string ()
@@ -54,4 +60,28 @@
   "Test that `eshell-stringify' correctly stringifies complex objects."
   (should (equal (eshell-stringify (list 'quote 'hello)) "'hello")))
 
+(ert-deftest esh-util-test/path/get ()
+  "Test that getting the Eshell path returns the expected results."
+  (let ((expected-path (butlast (exec-path))))
+    (should (equal (eshell-get-path)
+                   (if (eshell-under-windows-p)
+                       (cons "." expected-path)
+                     expected-path)))
+    (should (equal (eshell-get-path 'literal)
+                   expected-path))))
+
+(ert-deftest esh-util-test/path/get-remote ()
+  "Test that getting the remote Eshell path returns the expected results."
+  (let* ((default-directory ert-remote-temporary-file-directory)
+         (expected-path (butlast (exec-path))))
+    ;; Make sure we don't have a doubled directory separator.
+    (should (seq-every-p (lambda (i) (not (string-match-p "//" i)))
+                         (eshell-get-path)))
+    (should (equal (eshell-get-path)
+                   (mapcar (lambda (i)
+                             (concat (file-remote-p default-directory) i))
+                           expected-path)))
+    (should (equal (eshell-get-path 'literal)
+                   expected-path))))
+
 ;;; esh-util-tests.el ends here