From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757412AbcIRSSf (ORCPT ); Sun, 18 Sep 2016 14:18:35 -0400 Received: from mga03.intel.com ([134.134.136.65]:18946 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753982AbcIRSS0 (ORCPT ); Sun, 18 Sep 2016 14:18:26 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,358,1470726000"; d="scan'208";a="1032720564" From: Andi Kleen To: acme@kernel.org Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH 2/2] perf, tools: Fix completion script to handle comma list Date: Sun, 18 Sep 2016 11:18:19 -0700 Message-Id: <1474222699-28969-2-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1474222699-28969-1-git-send-email-andi@firstfloor.org> References: <1474222699-28969-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 some reason it only works in bash currently, but zsh is the same as before. 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 3ba80b2359cc..14c2be73b6fd 100644 --- a/tools/perf/perf-completion.sh +++ b/tools/perf/perf-completion.sh @@ -162,7 +162,11 @@ __perf_main () elif [[ $prev == @("-e"|"--event") && $prev_skip_opts == @(record|stat|top) ]]; then evts=$($cmd list --raw-dump) + 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