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

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 079aca216a6f1a1715439ebd89a5c0d68d1d53b3
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Jun 8 20:49:52 2009 +0300

    Split Slackware pkgtools completion to contrib/pkgtools.

diff --git a/CHANGES b/CHANGES
index 69b8f51..0693df6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -86,6 +86,7 @@ bash-completion (1.x)
   * Split FreeBSD kld(un)load completion to contrib/kldload.
   * Split FreeBSD pkg_* completion to contrib/pkg_install.
   * Split FreeBSD portupgrade and friends completion to contrib/portupgrade.
+  * Split Slackware pkgtools completion to contrib/pkgtools.
 
   [ Todd Zullinger ]
   * Make yum complete on filenames after install, deplist, update and upgrade
diff --git a/Makefile.am b/Makefile.am
index ecc9b52..1922b30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,6 +93,7 @@ bashcomp_DATA = contrib/ant \
 		contrib/pine \
 		contrib/pkg-config \
 		contrib/pkg_install \
+		contrib/pkgtools \
 		contrib/portupgrade \
 		contrib/postgresql \
 		contrib/postfix \
diff --git a/bash_completion b/bash_completion
index 58509aa..2c9eae4 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1407,21 +1407,6 @@ for i in env netstat seq uname units wget; do
 done
 unset i
 
-# Slackware Linux removepkg completion
-#
-have removepkg && [ -f /etc/slackware-version ] &&
-_removepkg()
-{
-	local packages cur
-
-	COMPREPLY=()
-	cur=`_get_cword`
-
-	COMPREPLY=( $( (cd /var/log/packages; compgen -f -- "$cur") ) )
-} &&
-complete -F _removepkg $filenames removepkg &&
-	complete $dirnames -f -X '!*.tgz' installpkg upgradepkg explodepkg
-
 # look(1) completion
 #
 have look &&
diff --git a/contrib/pkgtools b/contrib/pkgtools
new file mode 100644
index 0000000..dc92efb
--- /dev/null
+++ b/contrib/pkgtools
@@ -0,0 +1,17 @@
+# -*- mode: shell-script; sh-basic-offset: 8; indent-tabs-mode: t -*-
+# ex: ts=8 sw=8 noet filetype=sh
+#
+# bash completion for Slackware Linux pkgtools
+
+have removepkg && [ -f /etc/slackware-version ] &&
+_removepkg()
+{
+	local packages cur
+
+	COMPREPLY=()
+	cur=`_get_cword`
+
+	COMPREPLY=( $( (cd /var/log/packages; compgen -f -- "$cur") ) )
+} &&
+complete -F _removepkg $filenames removepkg &&
+	complete $dirnames -f -X '!*.tgz' installpkg upgradepkg explodepkg

-- 
bash-completion