linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Namhyung Kim <namhyung@kernel.org>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
	mingo@kernel.org, peterz@infradead.org, namhyung@kernel.org,
	fweisbec@gmail.com, dsahern@gmail.com, tglx@linutronix.de
Subject: [tip:perf/urgent] perf tools: Check existence of _get_comp_words_by_ref when bash completing
Date: Fri, 5 Oct 2012 01:52:38 -0700	[thread overview]
Message-ID: <tip-a1d668c3ffd38d611f8446615e8f797dcfdfc397@git.kernel.org> (raw)
In-Reply-To: <1349191294-6926-2-git-send-email-namhyung@kernel.org>

Commit-ID:  a1d668c3ffd38d611f8446615e8f797dcfdfc397
Gitweb:     http://git.kernel.org/tip/a1d668c3ffd38d611f8446615e8f797dcfdfc397
Author:     Namhyung Kim <namhyung@kernel.org>
AuthorDate: Wed, 3 Oct 2012 00:21:32 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 2 Oct 2012 18:36:42 -0300

perf tools: Check existence of _get_comp_words_by_ref when bash completing

The '_get_comp_words_by_ref' function is available from the bash
completion v1.2 so that earlier version emits following warning:

  $ perf re<TAB>_get_comp_words_by_ref: command not found

Use older '_get_cword' method when the above function doesn't exist.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1349191294-6926-2-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/bash_completion |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tools/perf/bash_completion b/tools/perf/bash_completion
index 1958fa5..3d48cee 100644
--- a/tools/perf/bash_completion
+++ b/tools/perf/bash_completion
@@ -1,12 +1,23 @@
 # perf completion
 
+function_exists()
+{
+	declare -F $1 > /dev/null
+	return $?
+}
+
 have perf &&
 _perf()
 {
-	local cur cmd
+	local cur prev cmd
 
 	COMPREPLY=()
-	_get_comp_words_by_ref cur prev
+	if function_exists _get_comp_words_by_ref; then
+		_get_comp_words_by_ref cur prev
+	else
+		cur=$(_get_cword)
+		prev=${COMP_WORDS[COMP_CWORD-1]}
+	fi
 
 	cmd=${COMP_WORDS[0]}
 

  parent reply	other threads:[~2012-10-05  8:52 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-02 15:21 [PATCH 0/3] perf tools: Bash completion update Namhyung Kim
2012-10-02 15:21 ` [PATCH 1/3] perf tools: Check existence of _get_comp_words_by_ref when bash completing Namhyung Kim
2012-10-02 15:54   ` Frederic Weisbecker
2012-10-04  1:43     ` Namhyung Kim
2012-10-04  8:44       ` Frederic Weisbecker
2012-10-05  8:52   ` tip-bot for Namhyung Kim [this message]
2012-10-02 15:21 ` [PATCH 2/3] perf tools: Complete long option names of perf command Namhyung Kim
2012-10-05  8:53   ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2012-10-02 15:21 ` [PATCH 3/3] perf tools: Long option completion support for each subcommands Namhyung Kim
2012-10-05  8:54   ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2012-10-02 16:01 ` [PATCH 0/3] perf tools: Bash completion update Frederic Weisbecker

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-a1d668c3ffd38d611f8446615e8f797dcfdfc397@git.kernel.org \
    --to=namhyung@kernel.org \
    --cc=acme@redhat.com \
    --cc=dsahern@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=peterz@infradead.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).