From: Mikael Magnusson <mikachu@gmail.com>
To: zsh-workers@zsh.org
Subject: PATCH 5/8: _adb: use $CURRENT instead of $#words
Date: Sun, 3 Apr 2022 17:50:16 +0200 [thread overview]
Message-ID: <20220403155019.24197-5-mikachu@gmail.com> (raw)
In-Reply-To: <20220403155019.24197-1-mikachu@gmail.com>
From: Mikael Magnusson <mikael.magnusson@sony.com>
---
Completion/Unix/Command/_adb | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Completion/Unix/Command/_adb b/Completion/Unix/Command/_adb
index 8d3eec5427..b8b2470a65 100644
--- a/Completion/Unix/Command/_adb
+++ b/Completion/Unix/Command/_adb
@@ -176,7 +176,7 @@ _adb_device_specification () {
(( $+functions[_adb_dispatch_shell] )) ||
_adb_dispatch_shell () {
- if [[ ${#words} -le 2 ]]
+ if [[ $CURRENT -le 2 ]]
then
(( $+functions[_adb_shell_commands_handler] )) && _adb_shell_commands_handler
return
@@ -272,7 +272,7 @@ _adb_intent_handler () {
(( $+functions[_adb_activity_manager_handler] )) ||
_adb_activity_manager_handler () {
- if [[ ${#words} -le 3 ]]
+ if [[ $CURRENT -le 3 ]]
then
_wanted am_argument expl 'am argument' compadd start startservice broadcast instrument profile
return
@@ -379,12 +379,12 @@ _adb_dispatch_install () {
(( $+functions[_adb_dispatch_push] )) ||
_adb_dispatch_push () {
- if [[ ${#words} -gt 3 ]]
+ if [[ $CURRENT -gt 3 ]]
then
_message -r "Notice: you can only push a single item at a time"
return
fi
- if [[ ${#words} -gt 2 ]]
+ if [[ $CURRENT -gt 2 ]]
then
_arguments '*: :_adb_remote_folder'
else
@@ -394,12 +394,12 @@ _adb_dispatch_push () {
(( $+functions[_adb_dispatch_pull] )) ||
_adb_dispatch_pull () {
- if [[ ${#words} -gt 3 ]]
+ if [[ $CURRENT -gt 3 ]]
then
_message -r "Notice: you can only pull a single item at a time"
return
fi
- if [[ ${#words} -gt 2 ]]
+ if [[ $CURRENT -gt 2 ]]
then
_arguments '*:local file/folder:_files'
else
--
2.15.1
next prev parent reply other threads:[~2022-04-03 15:57 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 ` Mikael Magnusson [this message]
2022-04-03 15:50 ` PATCH 6/8: _adb: Parse device spec correctly Mikael Magnusson
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-5-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).