[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-235-g26ae770

[Igor Murzov]

The following commit has been merged in the master branch:
commit 734ea2f1e5da47368617eb7fe2bde83a8a508b58
Author: Igor Murzov <igor at gplsoft.org>
Date:   Sun Jul 25 19:53:04 2010 +0400

    Remove duplicate check for slackware

diff --git a/contrib/pkgtools b/contrib/pkgtools
index 8b376f9..60a2d92 100644
--- a/contrib/pkgtools
+++ b/contrib/pkgtools
@@ -1,6 +1,9 @@
 # bash completion for Slackware Linux pkgtools
 
-have pkgtool && [ -f /etc/slackware-version ] &&
+[ -f /etc/slackware-version ] &&
+{
+
+have pkgtool &&
 _pkgtool()
 {
     COMPREPLY=()
@@ -35,7 +38,7 @@ _pkgtool()
 } &&
 complete -F _pkgtool pkgtool
 
-have removepkg && [ -f /etc/slackware-version ] &&
+have removepkg &&
 _removepkg()
 {
     COMPREPLY=()
@@ -50,7 +53,7 @@ _removepkg()
 } &&
 complete -F _removepkg -o filenames removepkg
 
-have upgradepkg && [ -f /etc/slackware-version ] &&
+have upgradepkg &&
 _upgradepkg()
 {
     COMPREPLY=()
@@ -64,7 +67,7 @@ _upgradepkg()
     COMPREPLY=( $(compgen -f -X "!*.t[bglx]z" -- "$cur") )
 } && complete -F _upgradepkg -o plusdirs upgradepkg
 
-have installpkg && [ -f /etc/slackware-version ] &&
+have installpkg &&
 _installpkg()
 {
     COMPREPLY=()
@@ -96,7 +99,7 @@ _installpkg()
                 $(compgen -d -- "$cur") )
 } && complete -F _installpkg -o filenames installpkg
 
-have makepkg && [ -f /etc/slackware-version ] &&
+have makepkg &&
 _makepkg()
 {
     COMPREPLY=()
@@ -119,9 +122,11 @@ _makepkg()
     _filedir
 } && complete -F _makepkg -o filenames makepkg
 
-have explodepkg && [ -f /etc/slackware-version ] &&
+have explodepkg &&
 complete -o plusdirs -f -X '!*.t[bglx]z' explodepkg
 
+}
+
 # Local variables:
 # mode: shell-script
 # sh-basic-offset: 4

-- 
bash-completion