From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756278AbcJRXVQ (ORCPT ); Tue, 18 Oct 2016 19:21:16 -0400 Received: from mga01.intel.com ([192.55.52.88]:62492 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753716AbcJRXVH (ORCPT ); Tue, 18 Oct 2016 19:21:07 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,364,1473145200"; d="scan'208";a="1046656584" From: Andi Kleen To: acme@kernel.org Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH 3/3] perf, tools: Fix completion script to handle comma list Date: Tue, 18 Oct 2016 16:21:01 -0700 Message-Id: <1476832861-7936-3-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1476832861-7936-1-git-send-email-andi@firstfloor.org> References: <1476832861-7936-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen The perf event completion script only handled a single event per -e option. So for "perf stat -e cycles,branches" branches could not be completed. Fix that issue by always only using the last suffix for completion. For some reason it only works in bash currently, but zsh is the same as before. v2: Handle conflict with upper case completion patch Signed-off-by: Andi Kleen --- tools/perf/perf-completion.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh index 72391ff68f66..582513e004f9 100644 --- a/tools/perf/perf-completion.sh +++ b/tools/perf/perf-completion.sh @@ -166,7 +166,11 @@ __perf_main () [[:upper:]]*) evts=$($cmd list --raw-dump vendor | tr a-z A-Z) ;; *) evts=$($cmd list --raw-dump) ;; esac + old="$cur" + cur="${cur/*[,{]/}" + prefix=${old%$cur} __perfcomp_colon "$evts" "$cur" + COMPREPLY=("${prefix}${COMPREPLY[0]}") else # List subcommands for perf commands if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched| -- 2.5.5