From: Steven Rostedt <rostedt@goodmis.org>
To: <linux-trace-devel@vger.kernel.org>
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Subject: [PATCH 3/3] trace-cmd completion: Add instance completion for -B
Date: Fri, 16 Apr 2021 20:46:37 -0400 [thread overview]
Message-ID: <20210417004637.3899514-4-rostedt@goodmis.org> (raw)
In-Reply-To: <20210417004637.3899514-1-rostedt@goodmis.org>
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
All commands but trace-cmd list use -B for instances. Since the list
command already has its own logic, make the default logic for all other
commands search the instances when -B is the previous command to complete.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
tracecmd/trace-cmd.bash | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/tracecmd/trace-cmd.bash b/tracecmd/trace-cmd.bash
index 9b0703b7..b01c7a07 100644
--- a/tracecmd/trace-cmd.bash
+++ b/tracecmd/trace-cmd.bash
@@ -225,7 +225,8 @@ __trace_cmd_dump_complete()
__show_command_options()
{
local command="$1"
- local cur="$2"
+ local prev="$2"
+ local cur="$3"
local cmds=( $(trace-cmd --help 2>/dev/null | \
grep " - " | sed 's/^ *//; s/ -.*//') )
@@ -233,7 +234,15 @@ __show_command_options()
if [ $cmd == "$command" ]; then
local opts=$(trace-cmd $cmd -h 2>/dev/null|grep "^ *-" | \
sed -e 's/ *\(-[^ ]*\).*/\1/')
- COMPREPLY=( $(compgen -W "${opts}" -- "$cur") )
+ if [ "$prev" == "-B" ]; then
+ for opt in ${opts[@]}; do
+ if [ "$opt" == "-B" ]; then
+ show_instances "$cur"
+ return 0
+ fi
+ done
+ fi
+ COMPREPLY=( $(compgen -W "${opts}" -- "$cur"))
return 0
fi
done
@@ -290,7 +299,7 @@ _trace_cmd_complete()
return 0
;;
*)
- __show_command_options "$w" "${cur}"
+ __show_command_options "$w" "${prev}" "${cur}"
;;
esac
}
--
2.29.2
prev parent reply other threads:[~2021-04-17 0:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-17 0:46 [PATCH 0/3] trace-cmd: Updated bash tab completion Steven Rostedt
2021-04-17 0:46 ` [PATCH 1/3] trace-cmd record: Add bash tab completion for -A Steven Rostedt
2021-04-17 0:46 ` [PATCH 2/3] trace-cmd record: Update -e event bash tab completion Steven Rostedt
2021-04-17 0:46 ` Steven Rostedt [this message]
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=20210417004637.3899514-4-rostedt@goodmis.org \
--to=rostedt@goodmis.org \
--cc=linux-trace-devel@vger.kernel.org \
/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).