mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-20 13:00:51 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
not needed.

* net/tramp-sh.el (tramp-find-shell): Don't set "busybox" property.
This commit is contained in:
Michael Albinus 2013-06-19 15:14:24 +02:00
parent a7f7138d0a
commit 15b263dcf8
3 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -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):

10
lisp/net/tramp-adb.el
View file

@ -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.

11
lisp/net/tramp-sh.el
View file

@ -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