From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D65DC10DCE for ; Thu, 12 Mar 2020 18:46:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C133206F1 for ; Thu, 12 Mar 2020 18:46:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=isovalent-com.20150623.gappssmtp.com header.i=@isovalent-com.20150623.gappssmtp.com header.b="b4HLHlTo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726683AbgCLSqc (ORCPT ); Thu, 12 Mar 2020 14:46:32 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44841 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727002AbgCLSq1 (ORCPT ); Thu, 12 Mar 2020 14:46:27 -0400 Received: by mail-wr1-f68.google.com with SMTP id l18so8815636wru.11 for ; Thu, 12 Mar 2020 11:46:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=isovalent-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gc4XGbEnsdtIWPY34ern2lcaBJ5zVKAE3vmO2e4SFfQ=; b=b4HLHlTostz7Agkn2AFNmXYks+1Xiah3Jdw4kWa2WylzJKSXGW1usqbHXH1/0gp8bS MIbK8Tam7VQXIdtoyxNvPa1f5I6XPjKAUvx1Wt/OeIdMbstatJSiCWgbtxM3PM/CE9hl O3ZzaiN/sE/iPTVYmez+tOpT//CzEZDU07lh3ZwNJRUqHrtrp9uy2h0H9pWJ+TqDiklL 7iYCWGE2WjXFFILhyP87Hvfl/3Fq3WUD5i/6xrmMgF9EzyAmpKb3/Q6cYVvYI54O7JKY DMwnfjaM+A8q+RPR3yVRA8DlGmprFzvXmUxwrQw8HU4+WmYyhkPUrK2k8rLQgkUfDBQE xpSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gc4XGbEnsdtIWPY34ern2lcaBJ5zVKAE3vmO2e4SFfQ=; b=V3wIfVOi5kLLdLmgB844tnOI2hRE81OvZ33+SL3bomlIkDyjvAu2n2aThuTFlDcM56 cI6eM2zVRrPr6MgmQkI8XYWbhvrj9tyfQSzCeaTzBIpESBb/YQo/TetUZWm2hgSqcSH7 nGCB5yd3y+XytN5Yf9IZZLE4CaEfCFRa+PBibxg4jQdXkvbHvaWc5fs4M6NeKzob1Gbh l+5RXV/ZQbEvQ22N7PudEZsj8MRmXZq1SQoAbHP8q6PYLxCE1dPUPf13cvzVqW0HZP1U VhHTxJCeFI7JXpTe/8skwOBREFdiLeiq/tvEJtIEChQ18Gdj8MCtVaywUtsfP1mTsSWn LZwQ== X-Gm-Message-State: ANhLgQ04GkiGQIkurKPD5m0mQXKZU46wikWYy7Dm2ttRwEfbs12YxPEq I0rrC7eMQCSeIY4sAoHYa7fASw== X-Google-Smtp-Source: ADFU+vvI2VgifkieNa7ajL6NE65/zw3GlwkiQJfZ+7KAgwYL3E1FzaZIwq9IPd4igBiu6aZOjV/9wA== X-Received: by 2002:adf:9cd1:: with SMTP id h17mr6709511wre.416.1584038785880; Thu, 12 Mar 2020 11:46:25 -0700 (PDT) Received: from localhost.localdomain ([194.35.118.177]) by smtp.gmail.com with ESMTPSA id b12sm50019665wro.66.2020.03.12.11.46.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 11:46:25 -0700 (PDT) From: Quentin Monnet To: Alexei Starovoitov , Daniel Borkmann Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Quentin Monnet Subject: [PATCH bpf-next v2 2/2] tools: bpftool: fix minor bash completion mistakes Date: Thu, 12 Mar 2020 18:46:08 +0000 Message-Id: <20200312184608.12050-3-quentin@isovalent.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200312184608.12050-1-quentin@isovalent.com> References: <20200312184608.12050-1-quentin@isovalent.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Minor fixes for bash completion: addition of program name completion for two subcommands, and correction for program test-runs and map pinning. The completion for the following commands is fixed or improved: # bpftool prog run [TAB] # bpftool prog pin [TAB] # bpftool map pin [TAB] # bpftool net attach xdp name [TAB] Signed-off-by: Quentin Monnet --- tools/bpf/bpftool/bash-completion/bpftool | 29 ++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/tools/bpf/bpftool/bash-completion/bpftool b/tools/bpf/bpftool/bash-completion/bpftool index a9cce9d3745a..9b0534f558f1 100644 --- a/tools/bpf/bpftool/bash-completion/bpftool +++ b/tools/bpf/bpftool/bash-completion/bpftool @@ -542,8 +542,8 @@ _bpftool() esac ;; run) - if [[ ${#words[@]} -lt 5 ]]; then - _filedir + if [[ ${#words[@]} -eq 4 ]]; then + COMPREPLY=( $( compgen -W "$PROG_TYPE" -- "$cur" ) ) return 0 fi case $prev in @@ -551,6 +551,10 @@ _bpftool() _bpftool_get_prog_ids return 0 ;; + name) + _bpftool_get_prog_names + return 0 + ;; data_in|data_out|ctx_in|ctx_out) _filedir return 0 @@ -756,11 +760,17 @@ _bpftool() esac ;; pin) - if [[ $prev == "$command" ]]; then - COMPREPLY=( $( compgen -W "$PROG_TYPE" -- "$cur" ) ) - else - _filedir - fi + case $prev in + $command) + COMPREPLY=( $( compgen -W "$MAP_TYPE" -- "$cur" ) ) + ;; + id) + _bpftool_get_map_ids + ;; + name) + _bpftool_get_map_names + ;; + esac return 0 ;; event_pipe) @@ -887,7 +897,7 @@ _bpftool() case $command in skeleton) _filedir - ;; + ;; *) [[ $prev == $object ]] && \ COMPREPLY=( $( compgen -W 'skeleton help' -- "$cur" ) ) @@ -987,6 +997,9 @@ _bpftool() id) _bpftool_get_prog_ids ;; + name) + _bpftool_get_prog_names + ;; pinned) _filedir ;; -- 2.20.1