* eshell/esh-ext.el (eshell-external-command): Do not examine

remote shell scripts.  See
<https://bugs.launchpad.net/ubuntu/+source/emacs23/+bug/1035790>.

* net/tramp-sh.el (tramp-remote-path): Add "/sbin" and
"/usr/local/sbin".

1 files changed, 5 insertions, 1 deletions

diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index 52df1587d5f..f9f9b1a558f 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -209,7 +209,11 @@ causing the user to wonder if anything's really going on..."
   (setq args (eshell-stringify-list (eshell-flatten-list args)))
   ;; (if (file-remote-p default-directory)
   ;;     (eshell-remote-command command args))
-  (let ((interp (eshell-find-interpreter command)))
+  (let ((interp (eshell-find-interpreter
+                 command
+                 ;; Do not examine remote shell scripts.
+                 (or (and (stringp command) (file-remote-p command))
+                     (file-remote-p default-directory)))))
     (cl-assert interp)
     (if (functionp (car interp))
         (apply (car interp) (append (cdr interp) args))