From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934712AbcJFTXn (ORCPT ); Thu, 6 Oct 2016 15:23:43 -0400 Received: from mga07.intel.com ([134.134.136.100]:58856 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932407AbcJFTXe (ORCPT ); Thu, 6 Oct 2016 15:23:34 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,454,1473145200"; d="scan'208";a="1067088841" 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: Thu, 6 Oct 2016 12:23:27 -0700 Message-Id: <1475781807-6034-3-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1475781807-6034-1-git-send-email-andi@firstfloor.org> References: <1475781807-6034-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 3b5a258a4b7b..819a1346689f 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 json | 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