* net/tramp-adb.el (tramp-adb-get-toolbox): Remove function, it is

not needed.

* net/tramp-sh.el (tramp-find-shell): Don't set "busybox" property.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c5b25b5eff5312614d21c791d077903fe94a2a9..680796cee7042a044d0f8abe4a4a37f0bfc6437c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-19  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp-adb.el (tramp-adb-get-toolbox): Remove function, it is
+       not needed.
+
+       * net/tramp-sh.el (tramp-find-shell): Don't set "busybox" property.
+
 2013-06-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * net/browse-url.el (browse-url-browser-function):

diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 613b20679552ec15dd1c5a661058f7208c93618b..14fb8575fffe829dc7cb4eaa08a8207e8e139b42 100644 (file)
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -375,16 +375,6 @@ pass to the OPERATION."
        "ls --color=never"
       "ls")))
 
-(defun tramp-adb-get-toolbox (vec)
-  "Get shell toolbox implementation: `toolbox' for original distributions
-or `busybox' for CyanogenMod based distributions"
-  (with-tramp-connection-property vec "toolbox"
-    (tramp-message vec 5 "Checking shell toolbox implementation")
-    (cond
-     ((zerop (tramp-adb-command-exit-status vec "busybox")) 'busybox)
-     ((zerop (tramp-adb-command-exit-status vec "toolbox")) 'toolbox)
-     (t 'unknown))))
-
 (defun tramp-adb--gnu-switches-to-ash
   (switches)
   "Almquist shell can't handle multiple arguments.

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index e45c2cf8511ec3785d26cbac346677b3ca56f74c..387084a807b654636f53c6b1ff5fd464742c0c22 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3626,13 +3626,7 @@ file exists and nonzero exit status otherwise."
       (unless (string-equal shell default-shell)
        (tramp-message
         vec 5 "Starting remote shell `%s' for tilde expansion" shell)
-       (tramp-open-shell vec shell))
-
-      ;; Busyboxes tend to behave strange.  We check for the existence.
-      (with-tramp-connection-property vec "busybox"
-       (tramp-send-command vec (format "%s --version" shell) t)
-       (let ((case-fold-search t))
-         (and (string-match "busybox" (buffer-string)) t))))))
+       (tramp-open-shell vec shell)))))
 
 ;; Utility functions.
 
@@ -4458,6 +4452,9 @@ function waits for output unless NOOUTPUT is set."
       ;; We mark the command string that it can be erased in the output buffer.
       (tramp-set-connection-property p "check-remote-echo" t)
       (setq command (format "%s%s%s" tramp-echo-mark command tramp-echo-mark)))
+    ;; Some busyboxes tend to close the connection when we use the
+    ;; following syntax for here-documents.  This we cannot test; it
+    ;; shall be set via `tramp-connection-properties'.
     (when (and (string-match "<<'EOF'" command)
               (not (tramp-get-connection-property vec "busybox" nil)))
       ;; Unset $PS1 when using here documents, in order to avoid