From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 13748 invoked from network); 3 Apr 2022 15:57:22 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 3 Apr 2022 15:57:22 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1649001442; b=VIk+WpwXrT736EnZOrfTLve4HLi4Xgi+CrTDvGqOXFuDP4U+XkXxSSHz/YAKXCVOMNEQhNNHI9 8qKASNraoEWcmPUFNzD72ujjM0QBHlsW7YNyjy8JbiV1If1gKhOZpSDdnt82XmVhdizY3ZPELe 0Zhi6asxLIHnH5du0J64g1eKRpygiy4kqKgO0JHqQs9HhS6u3RX34sIV2hmqniXNQkqvzWo2QL OUcAmPevCcDMmfIJav2Ybr8CuJMTwmJIYE+jXVpdV2U7ScRr5OjEQq5c5gyIq5R6nF0Al3u6Md cCUReefKkfX4s4RsE8aLUrKqFB6VoBiqewcNhsSEDLIydw==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-lf1-f50.google.com) smtp.remote-ip=209.85.167.50; dkim=pass header.d=gmail.com header.s=20210112 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1649001442; bh=f0i0LT6S+InztkDDhub/AJZOqJnXp3bROfGq+0//EBY=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:References:In-Reply-To:Message-ID:Date:Subject:To:From: DKIM-Signature:DKIM-Signature; b=Yuo0NYnkV/s/Wlr0Z/sC11ImjuFmvhCy2JClGtbDCL7c+oPGea1+7MyitmnxmEfThJX5IoX9u9 09Vzh5bHceqpKQ8PjHzhQXOPyGXhYQsMK/4gB3oj+NxFAoIIatilTnTaH/eiSQh9lNfeGgqOBi TKo8Y9160EOpZU42HH95d4KaQ9OoWc+BpAMm0AUSJD/FbLhoKywjrZF/xb59Pvugy9lDScJOcM gQ27jcPit1zQp83++Usv2pfOgBXZZfiJGlMdNeT729S/nkpvFqc7DHtsYdaT0I7IzSWdPy9rTY PyN4ye8J2n+Gm2talT5Yky+DVqrFqV48tC+DnK7UggGV+g==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:References:In-Reply-To:Message-Id: Date:Subject:To:From:Reply-To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=r/rLQuHoJOxTOP1iBaY53ui/Ujafm01q831wJHzMyAA=; b=lxhfDJdtU7c45urq2Kt1prlgaP PAx3yniPwSH5FAie16b4gQuYbSkarCr2JTc86EsSTWR+qqzkGREWGMdcZ26u/DzN+LW0xh27mctk8 v6ae52d8EQXe7JTKi9JCUlz3pHZrao1NOvHEuJeQQoKH4v+Aj652rbyWrrSAE2gGx2T2ljr8PQ1RH 1jT/Db/aWmUpPUmA2/gjReyvQRi0to2TKb3Qhi3T3GQxsCTy2/6pBXM/AJM9LKjd15H14LTVqvwOf lcdrvs4OLQ8/+1h7LluXjWehs7V77IbvziYZee2eHvFGfj/eMRkokxQ3S3Vb5ZcP/W0XOge7CBLPA o1UBIF4A==; Received: from authenticated user by zero.zsh.org with local id 1nb2bR-000C8Q-U9; Sun, 03 Apr 2022 15:57:21 +0000 Authentication-Results: zsh.org; iprev=pass (mail-lf1-f50.google.com) smtp.remote-ip=209.85.167.50; dkim=pass header.d=gmail.com header.s=20210112 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-lf1-f50.google.com ([209.85.167.50]:41479) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1nb2Uq-000991-RJ; Sun, 03 Apr 2022 15:50:33 +0000 Received: by mail-lf1-f50.google.com with SMTP id p15so13048011lfk.8 for ; Sun, 03 Apr 2022 08:50:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references; bh=r/rLQuHoJOxTOP1iBaY53ui/Ujafm01q831wJHzMyAA=; b=nvBPgxd/r2vKbM6HhNn3k7pGpCt24tLkZw/CTvXJ46UBcxh3iXPcQ5+2IAkTtzIP7z Xj/kR+B8S08ZJrc+JMtOTTUg5MB7s3+mH5CDh6d6sQsIUU52kHz/+o+nwFl7LNCS0g85 zSuiJYbP7ikRrR7CIHNsSx6igxwtPBvBIbLGCZfmqlnKFtoCDn6uzhPUCin7I1VZbQt0 v42DgJ/oyqMWji/HENsVW/KgRMF9aGirawR+8cEM5kUckW52fr/Io4R8nj/VDnennakO os1cbyGgqJ/fA6iqWGCBO3ryNFBYTqOd1pYJLx5wwH84c+IYXCiRJnMXRwPYhtJK6dKt TZIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=r/rLQuHoJOxTOP1iBaY53ui/Ujafm01q831wJHzMyAA=; b=HPJf1FyKZsYp3QQs2dxQ2xjlcMKiu1gElTPnzdcn4BtMQST1AmoVxjBbX89QfFQIpL swNznrcS66zixdTLEJPIcE8P3P2NPI3xYMrG9HYipRNI+cghP4aYIrPEx1sLhlEQFCG4 HFF6InvaEwV3tHScXLdKclvTM030JCFunHl782oCbnP1iUg69obKjegnvMWSU0rWKImp CPnxApUm0S8ttOY3wCOh7iCIRiRaeESFJql/FxZ9Eia0rDMY0dw28RmP7LsMq2+teQbc DAOh3QElCJZyjwKjKH3GNRre9K6eDmD++kyNL6gDelCMhoNFUpgkfcdD6ms222U3R1gJ oWUg== X-Gm-Message-State: AOAM532TzBILZ5rgC6d+kvfb6uHrXLiX9TreXpHa2nedyPhxrZ6Y53c8 5NGkT88bsRCpAMZoqoL7ysc0QdU1SLc= X-Google-Smtp-Source: ABdhPJyk4HpxNNGq7HnKvHx5SuQu0cw5m1EQPE0JwOgjcGGjeL3bjKUZfQjaKzZpn/VR7A5EDFwKQA== X-Received: by 2002:a05:6512:3b21:b0:44a:20fc:3e15 with SMTP id f33-20020a0565123b2100b0044a20fc3e15mr19742910lfv.266.1649001032342; Sun, 03 Apr 2022 08:50:32 -0700 (PDT) Received: from localhost.localdomain (h-212-85-88-110.A230.priv.bahnhof.se. [212.85.88.110]) by smtp.gmail.com with ESMTPSA id n17-20020a19ef11000000b0044a37ab9754sm857235lfh.39.2022.04.03.08.50.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Apr 2022 08:50:31 -0700 (PDT) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH 5/8: _adb: use $CURRENT instead of $#words Date: Sun, 3 Apr 2022 17:50:16 +0200 Message-Id: <20220403155019.24197-5-mikachu@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20220403155019.24197-1-mikachu@gmail.com> References: <20220403155019.24197-1-mikachu@gmail.com> X-Seq: 49965 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: From: Mikael Magnusson --- 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