--- Begin Message ---
Subject: |
[PATCH] Add coreutils 'ls' support for tramp adb |
Date: |
Sat, 24 Feb 2018 19:06:40 +0100 |
Support some Android derived systems where 'ls' binary is provided by
GNU Coreutils.
* lisp/net/tramp-adb.el (tramp-adb-ls-toolbox-regexp): Allow '.'
character in file permissions. It indicates an SELinux security
context.
(tramp-adb-get-ls-command): Detect Coreutils version of 'ls'. Force
output on one column and long-iso time style to match the behaviour of
toybox and busybox 'ls' commands.
---
lisp/net/tramp-adb.el | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index f5c45f68e9..be269aca51 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -71,7 +71,7 @@ tramp-adb-ls-date-regexp
(defconst tramp-adb-ls-toolbox-regexp
(concat
- "^[[:space:]]*\\([-[:alpha:]]+\\)" ; \1 permissions
+ "^[[:space:]]*\\([-\\.[:alpha:]]+\\)" ; \1 permissions
"\\(?:[[:space:]]+[[:digit:]]+\\)?" ; links (Android 7/toybox)
"[[:space:]]*\\([^[:space:]]+\\)" ; \2 username
"[[:space:]]+\\([^[:space:]]+\\)" ; \3 group
@@ -462,9 +462,15 @@ tramp-adb-get-ls-command
(with-tramp-connection-property vec "ls"
(tramp-message vec 5 "Finding a suitable `ls' command")
(cond
+ ;; Support Android derived systems where "ls" command is provided
+ ;; by GNU Coreutils. Force "ls" to print one column and set
+ ;; time-style to imitate other "ls" flavours.
+ ((tramp-adb-send-command-and-check vec "ls --help | grep coreutils")
+ "env COLUMNS=1 ls --time-style=long-iso")
;; Can't disable coloring explicitly for toybox ls command. We
- ;; must force "ls" to print just one column.
- ((tramp-adb-send-command-and-check vec "toybox") "env COLUMNS=1 ls")
+ ;; also must force "ls" to print just one column.
+ ((tramp-adb-send-command-and-check vec "toybox")
+ "env COLUMNS=1 ls")
;; On CyanogenMod based system BusyBox is used and "ls" output
;; coloring is enabled by default. So we try to disable it when
;; possible.
--
2.16.1
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#30594: [PATCH] Add coreutils 'ls' support for tramp adb |
Date: |
Mon, 26 Feb 2018 16:52:24 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
Version: 27.1
Mathieu Othacehe <address@hidden> writes:
> Oops wrong rebase, sorry about that. Here's an update version.
Thanks. I have pushed your patch to both Tramp and Emacs
repositories. Closing the bug.
> Mathieu
Best regards, Michael.
--- End Message ---