summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDavid Rothlisberger <david@rothlis.net>2012-12-26 11:54:51 +0000
committerStefan Sauer <ensonic@users.sf.net>2013-04-29 21:17:23 +0200
commit9f5e9c86320eaa53b6267aa614bb7e60cc3539aa (patch)
tree25f45ebcddf38b4aa81b3f36a36336f7dec59544 /tools
parent5d6635f9b428fdc574a098d8c1a2c6a94e1e7343 (diff)
tools/gstreamer-completion: Allow 1.0 and 0.10 scripts installed simultaneously
As long as the scripts' filenames are different, and the _gst_inspect and _gst_launch functions are named differently, the completion scripts for GStreamer 1.0 and 0.10 can be installed side-by-side in /etc/bash_completion.d. On my 0.10 branch† the completion script is renamed to "gstreamer-completion-0.10" and the functions are renamed to "_gst_inspect_0_10" and "_gst_launch_0_10". The remaining helper functions should remain identical (the command-line interface to gst-inspect hasn't changed, nor has the format of the gst-launch pipeline), so it doesn't matter if the 1.0 script overrides the 0.10 script's definitions. Note that I don't expect there to be another GStreamer 0.10 release, so the 0.10 completion script will probably never be officially released; but it is still worthwhile allowing both scripts to be installed alongside each other, for those who install the 0.10 completion script manually. Fixes: #690515 † https://github.com/drothlis/gstreamer/blob/bash-completion-0.10/tools/gstreamer-completion-0.10
Diffstat (limited to 'tools')
-rw-r--r--tools/gstreamer-completion8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/gstreamer-completion b/tools/gstreamer-completion
index ecbb52226..af5973a2a 100644
--- a/tools/gstreamer-completion
+++ b/tools/gstreamer-completion
@@ -1,9 +1,8 @@
# Bash tab-completion for GStreamer. -*- shell-script -*-
# Put this in /etc/bash_completion.d/
-_gst_version=1.0
-
_gst_inspect() {
+ local _gst_version=1.0
local cur cword prev words
_gst_init_completion
[[ "$cur" == "=" ]] && cur=
@@ -17,9 +16,10 @@ _gst_inspect() {
-- "$cur") )
[[ $COMPREPLY == *= ]] && compopt -o nospace 2>/dev/null
} &&
-complete -F _gst_inspect gst-inspect-$_gst_version
+complete -F _gst_inspect gst-inspect-1.0
_gst_launch() {
+ local _gst_version=1.0
local cur cword prev words
_gst_init_completion
local curtype option element property
@@ -29,7 +29,7 @@ _gst_launch() {
COMPREPLY=( $(_gst_launch_compgen) )
[[ $COMPREPLY == *= ]] && compopt -o nospace 2>/dev/null
} &&
-complete -o default -F _gst_launch gst-launch-$_gst_version
+complete -o default -F _gst_launch gst-launch-1.0
_gst_common_options() {
if [[ -n "$curtype" ]]; then # Called from _gst_launch