summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWGH <wgh@torlan.ru>2018-02-01 17:08:52 +0300
committerOliver Kiddle <opk@zsh.org>2018-02-07 20:52:28 +0100
commit0c324124d0c9837cdd3b43a18ec7d22fcd5e9012 (patch)
tree456a1506af2273b2330a16782c894083d9cf7e65
parentffacc9576683aa16a5f48f5b99a7a3c282c6159f (diff)
downloadzsh-0c324124d0c9837cdd3b43a18ec7d22fcd5e9012.tar.gz
zsh-0c324124d0c9837cdd3b43a18ec7d22fcd5e9012.zip
42336: force single column output when getting filenames with adb ls command
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_adb2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7fc34cdb9..95e3656a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2018-02-07 Oliver Kiddle <okiddle@yahoo.co.uk>
+ * wgh@torlan.ru: 42336: Completion/Unix/Command/_adb: force
+ single column output when getting filenames with adb ls command
+
* 42343: Completion/Unix/Command/_subversion: complete
--config-option more than once
diff --git a/Completion/Unix/Command/_adb b/Completion/Unix/Command/_adb
index 6b56d1748..f0ffdb5a4 100644
--- a/Completion/Unix/Command/_adb
+++ b/Completion/Unix/Command/_adb
@@ -480,7 +480,7 @@ _adb_remote_folder () {
pref=${pref%/*}/
fi
# yes, this ls is sickening to look at, but android doesn't have printf or find
- files=(${${(f)"$(adb ${=ADB_DEVICE_SPECIFICATION} shell 'ls -d 2> /dev/null '$pref'*/ '$pref'*')"}%$'\r'})
+ files=(${${(f)"$(adb ${=ADB_DEVICE_SPECIFICATION} shell 'ls -1d 2> /dev/null '$pref'*/ '$pref'*')"}%$'\r'})
dirs=(${${(M)files:#*/}%/})
files=(${${files:|dirs}:#*\*(/|)})
_adb_device_available && \