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

[David Paleino]

The following commit has been merged in the master branch:
commit 040841f8901345cefd82ea9704d7f941c4050518
Author: David Paleino <d.paleino at gmail.com>
Date:   Fri Jun 5 08:37:30 2009 +0200

    Split apt_build completion to contrib/apt-build

diff --git a/CHANGES b/CHANGES
index 3e02e85..c06b9d9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,6 +22,7 @@ bash-completion (1.x)
   * Split jar completion to contrib/jar
   * Split chkconfig completion to contrib/chkconfig
   * Split chsh completion to contrib/chsh
+  * Split apt_build completion to contrib/apt-build
 
   [ Ville Skyttä ]
   * Split yum and yum-arch completion into contrib/yum.
diff --git a/Makefile.am b/Makefile.am
index ea7600a..f2f3572 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,7 @@ sysconf_DATA = bash_completion
 bashcompdir = $(sysconfdir)/bash_completion.d
 bashcomp_DATA = contrib/ant \
 		contrib/apache2ctl \
+		contrib/apt-build \
 		contrib/aspell \
 		contrib/autorpm \
 		contrib/bind-utils \
diff --git a/bash_completion b/bash_completion
index 7af2630..439e630 100644
--- a/bash_completion
+++ b/bash_completion
@@ -2052,72 +2052,6 @@ _aptitude()
 complete -F _aptitude $default aptitude
 }
 
-# Debian apt-build(1) completion.
-#
-have apt-build &&
-_apt_build()
-{
-	local cur prev special i
-
-	COMPREPLY=()
-	cur=`_get_cword`
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-
-	for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do
-		if [[ ${COMP_WORDS[i]} == @(install|remove|source|info|clean) ]]; then
-			special=${COMP_WORDS[i]}
-		fi
-	done
-
-	if [ -n "$special" ]; then
-		case $special in
-		@(install|source|info))
-			COMPREPLY=( $( apt-cache pkgnames $cur 2> /dev/null ) )
-			return 0
-			;;
-		remove)
-			COMPREPLY=( $( _comp_dpkg_installed_packages \
-					$cur ) )
-			return 0
-			;;
-		*)
-			return 0
-			;;
-		esac
-	fi
-
-	case "$prev" in
-
-	     --@(patch|build-dir|repository-dir))
-		   _filedir
-		   return 0
-		   ;;
-
-	     -@(h|-help))
-		   return 0
-		   ;;
-
-	esac
-
-	if [[ "$cur" == -* ]]; then
-	    COMPREPLY=( $( compgen -W '--help --show-upgraded -u --build-dir \
-				  --repository-dir --build-only \
-				  --build-command --reinstall --rebuild \
-				  --remove-builddep --no-wrapper --purge \
-				  --patch --patch-strip -p --yes -y \
-				  --version -v --no-source' -- $cur ) )
-
-	else
-	    COMPREPLY=( $( compgen -W 'update upgrade install remove \
-				  source dist-upgrade world clean info \
-				  clean-build update-repository ' -- $cur ) )
-	fi
-
-
-	return 0
-} &&
-complete -F _apt_build $filenames apt-build
-
 # This function provides simple user at host completion
 #
 _user_at_host() {
diff --git a/contrib/apt-build b/contrib/apt-build
new file mode 100644
index 0000000..fe910b4
--- /dev/null
+++ b/contrib/apt-build
@@ -0,0 +1,65 @@
+# Debian apt-build(1) completion.
+#
+have apt-build &&
+_apt_build()
+{
+	local cur prev special i
+
+	COMPREPLY=()
+	cur=`_get_cword`
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do
+		if [[ ${COMP_WORDS[i]} == @(install|remove|source|info|clean) ]]; then
+			special=${COMP_WORDS[i]}
+		fi
+	done
+
+	if [ -n "$special" ]; then
+		case $special in
+		@(install|source|info))
+			COMPREPLY=( $( apt-cache pkgnames $cur 2> /dev/null ) )
+			return 0
+			;;
+		remove)
+			COMPREPLY=( $( _comp_dpkg_installed_packages \
+					$cur ) )
+			return 0
+			;;
+		*)
+			return 0
+			;;
+		esac
+	fi
+
+	case "$prev" in
+
+	     --@(patch|build-dir|repository-dir))
+		   _filedir
+		   return 0
+		   ;;
+
+	     -@(h|-help))
+		   return 0
+		   ;;
+
+	esac
+
+	if [[ "$cur" == -* ]]; then
+	    COMPREPLY=( $( compgen -W '--help --show-upgraded -u --build-dir \
+				  --repository-dir --build-only \
+				  --build-command --reinstall --rebuild \
+				  --remove-builddep --no-wrapper --purge \
+				  --patch --patch-strip -p --yes -y \
+				  --version -v --no-source' -- $cur ) )
+
+	else
+	    COMPREPLY=( $( compgen -W 'update upgrade install remove \
+				  source dist-upgrade world clean info \
+				  clean-build update-repository ' -- $cur ) )
+	fi
+
+
+	return 0
+} &&
+complete -F _apt_build $filenames apt-build

-- 
bash-completion