[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 0af9122381cfa3e090d1c6e9087a5ca75a00f74b
Author: Igor Murzov <igor at gplsoft.org>
Date:   Fri Apr 22 02:35:41 2011 +0400

    Abort completion file loading earlier if required commands are not available.
    
    It's follow up of 9af6f3504e8c94e5ead187b7cd223bd481548957

diff --git a/completions/pkgtools b/completions/pkgtools
index 2b438ef..b2386ba 100644
--- a/completions/pkgtools
+++ b/completions/pkgtools
@@ -1,7 +1,7 @@
 # bash completion for Slackware Linux pkgtools
 
-[ -f /etc/slackware-version ] &&
-{
+[ -f /etc/slackware-version ] || return
+
 
 have pkgtool &&
 _pkgtool()
@@ -123,5 +123,3 @@ _makepkg()
 
 have explodepkg &&
 complete -o plusdirs -f -X '!*.t[bglx]z' explodepkg
-
-}
diff --git a/completions/rpm2tgz b/completions/rpm2tgz
index 23c70ac..dca03f2 100644
--- a/completions/rpm2tgz
+++ b/completions/rpm2tgz
@@ -1,6 +1,7 @@
 # Slackware rpm2tgz completion.
 
-have rpm2tgz &&
+have rpm2tgz || return
+
 _rpm2tgz()
 {
     COMPREPLY=()
diff --git a/completions/sbopkg b/completions/sbopkg
index 698fdf1..c551e57 100644
--- a/completions/sbopkg
+++ b/completions/sbopkg
@@ -1,6 +1,7 @@
 # bash completion for sbopkg tool
 
-have sbopkg &&
+have sbopkg || return
+
 _sbopkg()
 {
     COMPREPLY=()
diff --git a/completions/slackpkg b/completions/slackpkg
index 139e7ed..7fe7cd0 100644
--- a/completions/slackpkg
+++ b/completions/slackpkg
@@ -1,6 +1,7 @@
 # bash completion for slackpkg tool
 
-have slackpkg &&
+have slackpkg || return
+
 _slackpkg()
 {
     COMPREPLY=()

-- 
bash-completion