Commit ceedd86e authored by Michael Albinus's avatar Michael Albinus
Browse files

Release Tramp 2.3.2

* doc/misc/tramp.texi (Android shell setup): Show default file name.
Structure section.

* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.3.2".

* test/lisp/net/tramp-tests.el (tramp-test-temporary-file-directory):
Offer home directory for mock method if it doesn't exist.
parent 169532b0
...@@ -1896,12 +1896,16 @@ where @samp{192.168.0.1} is the remote host IP address ...@@ -1896,12 +1896,16 @@ where @samp{192.168.0.1} is the remote host IP address
@value{tramp} uses the @option{adb} method to access Android devices. @value{tramp} uses the @option{adb} method to access Android devices.
Android devices provide a restricted shell access through an USB Android devices provide a restricted shell access through an USB
connection. The local host must have the @command{adb} program connection. The local host must have the @command{adb} program
installed. installed. Usually, it is sufficient to open the file
@file{@trampfn{adb,,/}}. Then you can navigate in the filesystem via
@code{dired}.
Applications such as @code{SSHDroid} that run @command{sshd} process Alternatively, applications such as @code{SSHDroid} that run
on the Android device can accept any @option{ssh}-based methods @command{sshd} process on the Android device can accept any
provided these settings are adjusted: @option{ssh}-based methods provided these settings are adjusted:
@itemize
@item
@command{sh} must be specified for remote shell since Android devices @command{sh} must be specified for remote shell since Android devices
do not provide @command{/bin/sh}. @command{sh} will then invoke do not provide @command{/bin/sh}. @command{sh} will then invoke
whatever shell is installed on the device with this setting: whatever shell is installed on the device with this setting:
...@@ -1917,6 +1921,7 @@ whatever shell is installed on the device with this setting: ...@@ -1917,6 +1921,7 @@ whatever shell is installed on the device with this setting:
where @samp{192.168.0.26} is the Android device's IP address. where @samp{192.168.0.26} is the Android device's IP address.
(@pxref{Predefined connection information}). (@pxref{Predefined connection information}).
@item
@value{tramp} requires preserving @env{PATH} environment variable from @value{tramp} requires preserving @env{PATH} environment variable from
user settings. Android devices prefer @file{/system/xbin} path over user settings. Android devices prefer @file{/system/xbin} path over
@file{/system/bin}. Both of these are set as follows: @file{/system/bin}. Both of these are set as follows:
...@@ -1928,7 +1933,7 @@ user settings. Android devices prefer @file{/system/xbin} path over ...@@ -1928,7 +1933,7 @@ user settings. Android devices prefer @file{/system/xbin} path over
@end group @end group
@end lisp @end lisp
@noindent @item
When the Android device is not @samp{rooted}, specify a writable When the Android device is not @samp{rooted}, specify a writable
directory for temporary files: directory for temporary files:
...@@ -1936,7 +1941,7 @@ directory for temporary files: ...@@ -1936,7 +1941,7 @@ directory for temporary files:
(add-to-list 'tramp-remote-process-environment "TMPDIR=$HOME") (add-to-list 'tramp-remote-process-environment "TMPDIR=$HOME")
@end lisp @end lisp
@noindent @item
Open a remote connection with the command @kbd{C-x C-f Open a remote connection with the command @kbd{C-x C-f
@trampfn{ssh,192.168.0.26#2222,}}, where @command{sshd} is listening @trampfn{ssh,192.168.0.26#2222,}}, where @command{sshd} is listening
on port @samp{2222}. on port @samp{2222}.
...@@ -1967,6 +1972,7 @@ the previous example, fix the connection properties as follows: ...@@ -1967,6 +1972,7 @@ the previous example, fix the connection properties as follows:
@noindent @noindent
Open a remote connection with a more concise command @kbd{C-x C-f Open a remote connection with a more concise command @kbd{C-x C-f
@trampfn{ssh,android,}}. @trampfn{ssh,android,}}.
@end itemize
@node Auto-save and Backup @node Auto-save and Backup
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
@c In the Tramp GIT, the version number is auto-frobbed from @c In the Tramp GIT, the version number is auto-frobbed from
@c configure.ac, so you should edit that file and run @c configure.ac, so you should edit that file and run
@c "autoconf && ./configure" to change the version number. @c "autoconf && ./configure" to change the version number.
@set trampver 2.3.2-pre @set trampver 2.3.2
@c Other flags from configuration @c Other flags from configuration
@set instprefix /usr/local @set instprefix /usr/local
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
;; Maintainer: Michael Albinus <michael.albinus@gmx.de> ;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
;; Keywords: comm, processes ;; Keywords: comm, processes
;; Package: tramp ;; Package: tramp
;; Version: 2.3.2-pre ;; Version: 2.3.2
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
;; should be changed only there. ;; should be changed only there.
;;;###tramp-autoload ;;;###tramp-autoload
(defconst tramp-version "2.3.2-pre" (defconst tramp-version "2.3.2"
"This version of Tramp.") "This version of Tramp.")
;;;###tramp-autoload ;;;###tramp-autoload
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
;; Check for Emacs version. ;; Check for Emacs version.
(let ((x (if (>= emacs-major-version 24) (let ((x (if (>= emacs-major-version 24)
"ok" "ok"
(format "Tramp 2.3.2-pre is not fit for %s" (format "Tramp 2.3.2 is not fit for %s"
(when (string-match "^.*$" (emacs-version)) (when (string-match "^.*$" (emacs-version))
(match-string 0 (emacs-version))))))) (match-string 0 (emacs-version)))))))
(unless (string-match "\\`ok\\'" x) (error "%s" x))) (unless (string-match "\\`ok\\'" x) (error "%s" x)))
......
...@@ -72,6 +72,10 @@ ...@@ -72,6 +72,10 @@
(add-to-list (add-to-list
'tramp-default-host-alist 'tramp-default-host-alist
`("\\`mock\\'" nil ,(system-name))) `("\\`mock\\'" nil ,(system-name)))
;; Emacs' Makefile sets $HOME to a nonexistent value. Needed in
;; batch mode only, therefore.
(unless (and (null noninteractive) (file-directory-p "~/"))
(setenv "HOME" temporary-file-directory))
(format "/mock::%s" temporary-file-directory))) (format "/mock::%s" temporary-file-directory)))
"Temporary directory for Tramp tests.") "Temporary directory for Tramp tests.")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment