[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113080: * net/tramp-adb.el (tramp-adb-get-toolbox):
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] trunk r113080: * net/tramp-adb.el (tramp-adb-get-toolbox): Remove function, it is |
Date: |
Wed, 19 Jun 2013 13:15:24 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113080
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Wed 2013-06-19 15:14:24 +0200
message:
* 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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/net/tramp-adb.el trampadb.el-20121204164216-03wyr5miam215d7f-1
lisp/net/tramp-sh.el trampsh.el-20100913133439-a1faifh29eqoi4nh-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-06-19 07:37:45 +0000
+++ b/lisp/ChangeLog 2013-06-19 13:14:24 +0000
@@ -1,3 +1,10 @@
+2013-06-19 Michael Albinus <address@hidden>
+
+ * 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 <address@hidden>
* net/browse-url.el (browse-url-browser-function):
=== modified file 'lisp/net/tramp-adb.el'
--- a/lisp/net/tramp-adb.el 2013-04-22 10:26:09 +0000
+++ b/lisp/net/tramp-adb.el 2013-06-19 13:14:24 +0000
@@ -375,16 +375,6 @@
"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.
=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el 2013-04-22 10:26:09 +0000
+++ b/lisp/net/tramp-sh.el 2013-06-19 13:14:24 +0000
@@ -3626,13 +3626,7 @@
(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 @@
;; 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113080: * net/tramp-adb.el (tramp-adb-get-toolbox): Remove function, it is,
Michael Albinus <=