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

[David Paleino]

The following commit has been merged in the master branch:
commit 8c88c2283f1f759b008b04a54ce1216631b8b788
Author: David Paleino <d.paleino at gmail.com>
Date:   Fri Jun 5 21:42:59 2009 +0200

    Split cardctl completion to contrib/cardctl

diff --git a/CHANGES b/CHANGES
index 9276a86..29aff01 100644
--- a/CHANGES
+++ b/CHANGES
@@ -31,6 +31,7 @@ bash-completion (1.x)
     of grep-status if available)
   * Split gcc completion to contrib/gcc
   * Split dselect completion to contrib/dselect
+  * Split cardctl completion to contrib/cardctl
 
   [ Ville Skyttä ]
   * Split yum and yum-arch completion into contrib/yum.
diff --git a/Makefile.am b/Makefile.am
index f22cfa2..a36506f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,7 @@ bashcomp_DATA = contrib/ant \
 		contrib/bluez-utils \
 		contrib/brctl \
 		contrib/bzip2 \
+		contrib/cardctl \
 		contrib/chkconfig \
 		contrib/chsh \
 		contrib/cfengine \
diff --git a/bash_completion b/bash_completion
index ec6f5c3..3e091e8 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1443,24 +1443,6 @@ for i in env netstat seq uname units wget; do
 done
 unset i
 
-# Linux cardctl(8) completion
-#
-have cardctl &&
-_cardctl()
-{
-	local cur
-
-	COMPREPLY=()
-	cur=`_get_cword`
-
-	if [ $COMP_CWORD -eq 1 ]; then
-		COMPREPLY=( $( compgen -W 'status config ident suspend \
-					   resume reset eject insert scheme' \
-			       -- $cur ) )
-	fi
-} &&
-complete -F _cardctl cardctl
-
 # PINE address-book completion
 #
 have pine &&
diff --git a/contrib/cardctl b/contrib/cardctl
new file mode 100644
index 0000000..173c917
--- /dev/null
+++ b/contrib/cardctl
@@ -0,0 +1,17 @@
+# Linux cardctl(8) completion
+#
+have cardctl &&
+_cardctl()
+{
+	local cur
+
+	COMPREPLY=()
+	cur=`_get_cword`
+
+	if [ $COMP_CWORD -eq 1 ]; then
+		COMPREPLY=( $( compgen -W 'status config ident suspend \
+					   resume reset eject insert scheme' \
+			       -- $cur ) )
+	fi
+} &&
+complete -F _cardctl cardctl

-- 
bash-completion