From: Mikael Magnusson <mikachu@gmail.com>
To: zsh-workers@zsh.org
Subject: PATCH 6/8: _adb: Parse device spec correctly
Date: Sun, 3 Apr 2022 17:50:17 +0200 [thread overview]
Message-ID: <20220403155019.24197-6-mikachu@gmail.com> (raw)
In-Reply-To: <20220403155019.24197-1-mikachu@gmail.com>
From: Mikael Magnusson <mikael.magnusson@sony.com>
This was particularly annoying when trying to complete logtags after adb logcat -s
---
Completion/Unix/Command/_adb | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/Completion/Unix/Command/_adb b/Completion/Unix/Command/_adb
index b8b2470a65..b31b84c892 100644
--- a/Completion/Unix/Command/_adb
+++ b/Completion/Unix/Command/_adb
@@ -82,6 +82,7 @@ _adb() {
if ! adb ${ADB_DEVICE_SPECIFICATION} shell exit 2>/dev/null; then
# early bail-out until a single valid device/emulator is specified and up-and-running
[[ $words[CURRENT-1] = -s ]] || _message -r "No (started) device specified, completions do not yet work"
+ #TODO handle -t transport-id
_arguments \
'-s[serial]: :_adb_device_serial' \
'( -e)-d[device]' \
@@ -165,13 +166,11 @@ _adb_sanitize_context () {
(( $+functions[_adb_device_specification] )) ||
_adb_device_specification () {
- local -a word
- word=($words[(R)-[des]])
- if [[ $words[(R)-s] == -s ]]; then
- local i=$words[(I)-s]
- word=($words[i,i+1])
+ if [[ $words[2] == -[de] ]]; then
+ ADB_DEVICE_SPECIFICATION=($words[2])
+ elif [[ $words[2] == -[st] ]]; then
+ ADB_DEVICE_SPECIFICATION=($words[2,3])
fi
- ADB_DEVICE_SPECIFICATION=($word)
}
(( $+functions[_adb_dispatch_shell] )) ||
--
2.15.1
next prev parent reply other threads:[~2022-04-03 15:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-03 15:50 PATCH 1/8: _adb: handle exec-out like shell Mikael Magnusson
2022-04-03 15:50 ` PATCH 2/8: _adb: Add dumpsys and cmd completion Mikael Magnusson
2022-04-03 15:50 ` PATCH 3/8: _adb: Fix device serial completion for hostname:port syntax Mikael Magnusson
2022-04-03 15:50 ` PATCH 4/8: _adb: Complete services for start/stop Mikael Magnusson
2022-04-03 15:50 ` PATCH 5/8: _adb: use $CURRENT instead of $#words Mikael Magnusson
2022-04-03 15:50 ` Mikael Magnusson [this message]
2022-04-03 15:50 ` PATCH 7/8: _adb: Handle dumpsys SurfaceFlinger arguments Mikael Magnusson
2022-04-03 15:50 ` PATCH 8/8: _adb: also replace model names, since device names aren't sent on wifi listing Mikael Magnusson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220403155019.24197-6-mikachu@gmail.com \
--to=mikachu@gmail.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).