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 13937 invoked from network); 3 Apr 2022 15:58:44 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 3 Apr 2022 15:58:44 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1649001524; b=elCQBgTJDoVpvy7AOkuOJOR8swkvjrQmc7AvFs3a7SXdwfrewxSaa5jmn5Ywc2W4RxNCz6Q7DG nQ1WWu5Qxl68z6KQXn1sBmcxiDRKKdSPqMuKqX/12VLgwhbiTi9tP61U5xUG66C6xOA8tmcr5o 9sXzo/xhiUbpeFZ7T0GbJU9FcEy0DHNxfAQ11BMy/5wHykcsEUDaXkXl9rnGVXQwlzf0CgJuLm 87v0LhBFJgPlhaxkGdJXzp4t9pPn6wvHSmig+B9eE3HGD0cew7QY8hbH2y7oASNUyEWmghopml bXGttr4gftE08F9gJFCddAezruulrHVDQL8EFFMngHBiyg==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-lj1-f175.google.com) smtp.remote-ip=209.85.208.175; 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=1649001524; bh=/5lwAtbOu4bpeDH+n1mtJ7xJbB9zDEHy07+3TvDe4e4=; 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=jnlBF9io6LUNqjZLmyr3aYKdyIuehr/dlcx3BUWk/zksvI9hburIoCixBGAhpxMvZSd0k3jZDy T/Xvzp6IizKwrOqxOmnDtIJxf5Nq0r+GNGGyrWIp/jw18adNnHyKZld7rR90E/vrpJWi1LQEQK 4L9xMoStd7deJp7YU3AZasXv1PRfF2TUBcqgCluf1Jmuq4m61L7xMPKi3KDNbbSmK2jXjC25St /lOL3F2ehYuiJ2tqD7kdKLpHRoO6d766Al40U4epH3TtGc7L7KGu1iI/SLlWb0VBpIQmD8yWV4 n1RoIK/APR4hKnyeVbtGZ7/4/qkpqP0NE1TpQF64BDf+hQ==; 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=L2FnoQwgW1A1mS3yVEizhKvGSjoXcKckD5oB2ccghAs=; b=RkTYLf+ITvXFejBx+iTluNZB71 KH4GE+7ZKzm51JulUurJ7KrWi6WXtETXsQnQI0XCUfTqfOJNYMmtinzdzdvgjLd1b/R7lMg8c755X 4R6FLCCIwB+VMKm3ZJpo33ysw9cJalE0MDyjcwxyTLqHeVCkw246BwSEUa6+PnLa6B5Jd5scMA8nI r53s5iCOugoe4obxMHOhIcbmEnjnVQsbj6in57htrnv4iQ82jHpUtNjTnotZTLCtNO9kSEVJumRRj i0AfhUbxGo11EN0odkHqyap6ID50oe4enT1HSgInDFDeCcsXbS6B5J8WHHO4pemg1y59Zp5Xfxk/4 o4tJj4ow==; Received: from authenticated user by zero.zsh.org with local id 1nb2cm-000CnI-Gv; Sun, 03 Apr 2022 15:58:44 +0000 Authentication-Results: zsh.org; iprev=pass (mail-lj1-f175.google.com) smtp.remote-ip=209.85.208.175; dkim=pass header.d=gmail.com header.s=20210112 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-lj1-f175.google.com ([209.85.208.175]:42496) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1nb2Ur-00099T-TQ; Sun, 03 Apr 2022 15:50:34 +0000 Received: by mail-lj1-f175.google.com with SMTP id c15so9956552ljr.9 for ; Sun, 03 Apr 2022 08:50:33 -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=L2FnoQwgW1A1mS3yVEizhKvGSjoXcKckD5oB2ccghAs=; b=gWj5ZGuEtoN3hpxomPabIDct/5yKMGwEBDm4ioYf/J6IGOXOAVfBtuPBSUo0aZ2o4J 3vaZCwgyvJ0tUAEGVPqxGXulIm4Oyrba6MtmrOVg2cSBMxJc5nXCUTh119OJqgefBWEV WlJmj7NrLw+KilWblFcNX30XWJL/U+mIg5O9zLJjOG7sDQ7QMilA9CCFqxPSopckXde/ 6R/DbAv6jkuqnEWkZ4t5R5P8WYYvoGKyJkpAseQ9SiF8ABZDgv1ggskhc42DQKxnu64i IMmEQ3kqawACIm3x9HxSgqpHfdRtc7jW5LXWi5RAKJnnQCJS5pIBFm5vkyJR4NZfaL3h KSSg== 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=L2FnoQwgW1A1mS3yVEizhKvGSjoXcKckD5oB2ccghAs=; b=TW3YlaV3o+1Q+rM0lmTjEVO6AOHzy9yU/65JZMFavninueY9qRbBGETRolxO7niBc/ P51S5+lWhKxJfUKOTQxpeQh1yceUzzDk2itMN/506760aPV0cdpyIi8yvNiyN3r6/8qx WYiMR5XUuC1wXEDChHG1dzTkFnpfqcDwspC+PhRl8pV5NUDAnwkQVxT93HYSGKmZo3BV dUqiVmiCtN+ZKS7cnZiozHaocjqOibS4xabdzHxS1YDBLlPCfJFJyPQf6uDqUHwpLbY8 x12NOCS9ZwzWtERqlt3ig7lkqTbw1izhavy/6FhAIxnL7UgNyyAa4riMV+7XhqjPW4so /dxA== X-Gm-Message-State: AOAM530j1ckaKMx+jC5ZcONlk8oSxHPWXNy+ApRGd3+Ra2SkRo4WLR2j veg7NfOJBaajqkGNoDX3QVLMSjUqV8k= X-Google-Smtp-Source: ABdhPJydM5CqOCcHd/fvhiGQU0fx0bcmxiEwr2d1zeNaX3AtlhudI4GgY0MzYG7PjMSYMPWylaPmJg== X-Received: by 2002:a2e:a907:0:b0:249:6747:d8ca with SMTP id j7-20020a2ea907000000b002496747d8camr19205838ljq.452.1649001033329; Sun, 03 Apr 2022 08:50:33 -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.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Apr 2022 08:50:32 -0700 (PDT) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH 6/8: _adb: Parse device spec correctly Date: Sun, 3 Apr 2022 17:50:17 +0200 Message-Id: <20220403155019.24197-6-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: 49966 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 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