[Bash-completion-commits] [SCM] bash-completion branch, master, updated. b3f8e617ac7569a4c6bd3f3f6e6e3bc51d61d3f4

[Guillaume Rousse]

The following commit has been merged in the master branch:
commit 313867cadae12a29000cc482015f07532c9040bf
Author: Guillaume Rousse <guillomovitch at zarb.org>
Date:   Wed May 27 18:37:01 2009 +0200

    split dcop completion

diff --git a/Makefile.am b/Makefile.am
index 2b0a4f7..6ef21a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,7 @@ bashcomp_DATA = contrib/ant \
 		contrib/cowsay \
 		contrib/cpan2dist \
 		contrib/cpio \
+		contrib/dcop \
 		contrib/dd \
 		contrib/dhclient \
 		contrib/dsniff \
diff --git a/bash_completion b/bash_completion
index 0fcb5d1..430a148 100644
--- a/bash_completion
+++ b/bash_completion
@@ -4444,24 +4444,6 @@ _xrandr()
 } &&
 complete -F _xrandr xrandr
 
-# KDE dcop completion
-#
-have dcop &&
-_dcop()
-{
-	local cur compstr
-
-	COMPREPLY=()
-	cur=`_get_cword`
-	if [ -z $cur ]; then
-	    compstr=${COMP_WORDS[*]}
-	else
-	    compstr=$( command echo ${COMP_WORDS[*]} | sed "s/ $cur$//" )
-	fi
-	COMPREPLY=( $( compgen -W '$( command $compstr | sed s/\(.*\)// )'  -- $cur ) )
-} &&
-complete -F _dcop dcop
-
 # iconv(1) completion
 #
 have iconv &&
diff --git a/contrib/qdbus b/contrib/dcop
similarity index 52%
copy from contrib/qdbus
copy to contrib/dcop
index ba749c6..85a67ab 100644
--- a/contrib/qdbus
+++ b/contrib/dcop
@@ -1,20 +1,20 @@
 # -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
 # ex: ts=8 sw=8 noet filetype=sh
 #
-# Qt qdbus completion
-#
-have qdbus &&
-_qdbus()
+# bash completion for dcop
+
+have dcop &&
+_dcop()
 {
 	local cur compstr
-	
+
 	COMPREPLY=()
 	cur=`_get_cword`
-	if [ -z "$cur" ]; then
-		compstr=${COMP_WORDS[*]}
+	if [ -z $cur ]; then
+	    compstr=${COMP_WORDS[*]}
 	else
-		compstr=$( command echo ${COMP_WORDS[*]} | sed "s/ ${cur/\//\\/}$//" )
+	    compstr=$( command echo ${COMP_WORDS[*]} | sed "s/ $cur$//" )
 	fi
-	COMPREPLY=( $( compgen -W '$( command $compstr | sed s/\(.*\)// )' -- "$cur" ) )
+	COMPREPLY=( $( compgen -W '$( command $compstr | sed s/\(.*\)// )'  -- $cur ) )
 } &&
-complete -F _qdbus qdbus
+complete -F _dcop dcop

-- 
bash-completion