linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Ramkumar Ramachandra <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
	mingo@kernel.org, fweisbec@gmail.com, artagnon@gmail.com,
	tglx@linutronix.de
Subject: [tip:perf/core] perf completion: Use more comp words
Date: Mon, 14 Oct 2013 22:23:27 -0700	[thread overview]
Message-ID: <tip-6e0dc374a2c912a8a967ea8a4f9696dd4b0a6d3e@git.kernel.org> (raw)
In-Reply-To: <1372941691-14684-8-git-send-email-artagnon@gmail.com>

Commit-ID:  6e0dc374a2c912a8a967ea8a4f9696dd4b0a6d3e
Gitweb:     http://git.kernel.org/tip/6e0dc374a2c912a8a967ea8a4f9696dd4b0a6d3e
Author:     Ramkumar Ramachandra <artagnon@gmail.com>
AuthorDate: Thu, 4 Jul 2013 18:11:31 +0530
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 9 Oct 2013 11:12:31 -0300

perf completion: Use more comp words

The completion words $words and $cword are available, so we might as
well use them instead of directly accessing COMP_WORDS.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/1372941691-14684-8-git-send-email-artagnon@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/bash_completion | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/perf/bash_completion b/tools/perf/bash_completion
index ee9c6d8..62e157db 100644
--- a/tools/perf/bash_completion
+++ b/tools/perf/bash_completion
@@ -92,15 +92,15 @@ __ltrim_colon_completions()
 type perf &>/dev/null &&
 _perf()
 {
-	local cur prev cmd
+	local cur words cword prev cmd
 
 	COMPREPLY=()
-	_get_comp_words_by_ref -n : cur prev
+	_get_comp_words_by_ref -n =: cur words cword prev
 
-	cmd=${COMP_WORDS[0]}
+	cmd=${words[0]}
 
 	# List perf subcommands or long options
-	if [ $COMP_CWORD -eq 1 ]; then
+	if [ $cword -eq 1 ]; then
 		if [[ $cur == --* ]]; then
 			COMPREPLY=( $( compgen -W '--help --version \
 			--exec-path --html-path --paginate --no-pager \
@@ -110,13 +110,13 @@ _perf()
 			COMPREPLY=( $( compgen -W '$cmds' -- "$cur" ) )
 		fi
 	# List possible events for -e option
-	elif [[ $prev == "-e" && "${COMP_WORDS[1]}" == @(record|stat|top) ]]; then
+	elif [[ $prev == "-e" && "${words[1]}" == @(record|stat|top) ]]; then
 		evts=$($cmd list --raw-dump)
 		COMPREPLY=( $( compgen -W '$evts' -- "$cur" ) )
 		__ltrim_colon_completions $cur
 	# List long option names
 	elif [[ $cur == --* ]];  then
-		subcmd=${COMP_WORDS[1]}
+		subcmd=${words[1]}
 		opts=$($cmd $subcmd --list-opts)
 		COMPREPLY=( $( compgen -W '$opts' -- "$cur" ) )
 	fi

  reply	other threads:[~2013-10-15  5:23 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-04 12:41 [PATCH 0/7] Minor perf completion improvements Ramkumar Ramachandra
2013-07-04 12:41 ` [PATCH 1/7] perf completion: don't dictate perf install location Ramkumar Ramachandra
2013-10-15  5:22   ` [tip:perf/core] perf completion: Don' t " tip-bot for Ramkumar Ramachandra
2013-07-04 12:41 ` [PATCH 2/7] perf completion: update __ltrim_colon_completions Ramkumar Ramachandra
2013-10-15  5:22   ` [tip:perf/core] perf completion: Update __ltrim_colon_completions tip-bot for Ramkumar Ramachandra
2013-07-04 12:41 ` [PATCH 3/7] perf completion: strip dependency on _filedir Ramkumar Ramachandra
2013-10-15  5:23   ` [tip:perf/core] perf completion: Strip " tip-bot for Ramkumar Ramachandra
2013-07-04 12:41 ` [PATCH 4/7] perf completion: modernize style Ramkumar Ramachandra
2013-07-16 17:19   ` Arnaldo Carvalho de Melo
2013-07-16 17:22     ` Ramkumar Ramachandra
2013-08-07 20:26       ` Arnaldo Carvalho de Melo
2013-08-08  4:19         ` Ramkumar Ramachandra
2013-09-18 23:31         ` Ramkumar Ramachandra
2013-07-04 12:41 ` [PATCH 5/7] perf completion: strip function_exists () Ramkumar Ramachandra
2013-10-15  5:23   ` [tip:perf/core] perf completion: Strip " tip-bot for Ramkumar Ramachandra
2013-07-04 12:41 ` [PATCH 6/7] perf completion: strip dependency on bash-completion Ramkumar Ramachandra
2013-10-15  5:23   ` [tip:perf/core] perf completion: Strip " tip-bot for Ramkumar Ramachandra
2013-07-04 12:41 ` [PATCH 7/7] perf completion: use more comp words Ramkumar Ramachandra
2013-10-15  5:23   ` tip-bot for Ramkumar Ramachandra [this message]
2013-07-05  2:46 ` [PATCH 0/7] Minor perf completion improvements Namhyung Kim
2013-07-05 10:03   ` Ramkumar Ramachandra
2013-07-15  7:51 ` Ramkumar Ramachandra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-6e0dc374a2c912a8a967ea8a4f9696dd4b0a6d3e@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=acme@redhat.com \
    --cc=artagnon@gmail.com \
    --cc=fweisbec@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).