From 5e555fc1cfca001e689dc2598d0395472d8c6f4a Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Mon, 17 Aug 2015 12:29:03 +0200
Subject: Completions: Don't check $cmd[1]

This is already done by fish before calling the completion.

It breaks completion with combiners (#2025) and also with wrappers.

(This does not include git because that's better solved in #2145)
---
 share/completions/brew.fish       | 2 +-
 share/completions/bundle.fish     | 2 +-
 share/completions/composer.fish   | 6 +-----
 share/completions/heroku.fish     | 2 +-
 share/completions/lein.fish       | 2 +-
 share/completions/mix.fish        | 2 +-
 share/completions/netctl.fish     | 2 +-
 share/completions/npm.fish        | 2 +-
 share/completions/opam.fish       | 2 +-
 share/completions/rbenv.fish      | 2 +-
 share/completions/ruby-build.fish | 2 +-
 share/completions/travis.fish     | 2 +-
 12 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/share/completions/brew.fish b/share/completions/brew.fish
index bdafbd4d..7cc51420 100644
--- a/share/completions/brew.fish
+++ b/share/completions/brew.fish
@@ -1,6 +1,6 @@
 function __fish_brew_needs_command
   set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 -a $cmd[1] = 'brew' ]
+  if [ (count $cmd) -eq 1 ]
     return 0
   end
   return 1
diff --git a/share/completions/bundle.fish b/share/completions/bundle.fish
index 36a8bbc1..8499d03b 100644
--- a/share/completions/bundle.fish
+++ b/share/completions/bundle.fish
@@ -2,7 +2,7 @@
 
 function __fish_bundle_no_command --description 'Test if bundle has been given no subcommand'
   set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 -a $cmd[1] = 'bundle' ]
+  if [ (count $cmd) -eq 1 ]
     return 0
   end
   return 1
diff --git a/share/completions/composer.fish b/share/completions/composer.fish
index 5a59728e..d7b78e9d 100644
--- a/share/completions/composer.fish
+++ b/share/completions/composer.fish
@@ -1,11 +1,7 @@
 function __fish_composer_needs_command
   set cmd (commandline -opc)
 
-  if [ (count $cmd) -eq 1 -a $cmd[1] = 'composer' ]
-    return 0
-  end
-
-  if [ (count $cmd) -eq 1 -a $cmd[1] = 'composer.phar' ]
+  if [ (count $cmd) -eq 1 ]
     return 0
   end
 
diff --git a/share/completions/heroku.fish b/share/completions/heroku.fish
index d7618529..2d11b15b 100644
--- a/share/completions/heroku.fish
+++ b/share/completions/heroku.fish
@@ -31,7 +31,7 @@ end
 
 function __fish_heroku_needs_command
     set cmd (commandline -opc)
-    if [ (count $cmd) -eq 1 -a $cmd[1] = 'heroku' ]
+    if [ (count $cmd) -eq 1 ]
         return 0
     end
     return 1
diff --git a/share/completions/lein.fish b/share/completions/lein.fish
index fa4eadfe..1006b0eb 100644
--- a/share/completions/lein.fish
+++ b/share/completions/lein.fish
@@ -1,6 +1,6 @@
 function __fish_lein_needs_command
   set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 -a $cmd[1] = 'lein' ]
+  if [ (count $cmd) -eq 1 ]
     return 0
   end
   return 1
diff --git a/share/completions/mix.fish b/share/completions/mix.fish
index ba71c2a2..f51dac76 100644
--- a/share/completions/mix.fish
+++ b/share/completions/mix.fish
@@ -1,6 +1,6 @@
 function __fish_mix_needs_command
   set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 -a $cmd[1] = 'mix' ]
+  if [ (count $cmd) -eq 1 ]
     return 0
   end
   return 1
diff --git a/share/completions/netctl.fish b/share/completions/netctl.fish
index 595e09ad..ac5c07b5 100644
--- a/share/completions/netctl.fish
+++ b/share/completions/netctl.fish
@@ -1,6 +1,6 @@
 function __fish_netctl_needs_command
   set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 -a $cmd[1] = 'netctl' ]
+  if [ (count $cmd) -eq 1 ]
     return 0
   end
   return 1
diff --git a/share/completions/npm.fish b/share/completions/npm.fish
index 2e65719f..e2f7277e 100644
--- a/share/completions/npm.fish
+++ b/share/completions/npm.fish
@@ -7,7 +7,7 @@
 function __fish_npm_needs_command
   set cmd (commandline -opc)
 
-  if [ (count $cmd) -eq 1 -a $cmd[1] = 'npm' ]
+  if [ (count $cmd) -eq 1 ]
     return 0
   end
 
diff --git a/share/completions/opam.fish b/share/completions/opam.fish
index f24ae408..5e86c7b7 100644
--- a/share/completions/opam.fish
+++ b/share/completions/opam.fish
@@ -20,7 +20,7 @@ end
 
 function __fish_opam_needs_command
     set cmd (commandline -opc)
-    if [ (count $cmd) -eq 1 -a $cmd[1] = 'opam' ]
+    if [ (count $cmd) -eq 1 ]
         return 0
     end
     return 1
diff --git a/share/completions/rbenv.fish b/share/completions/rbenv.fish
index e055b15e..4fbddff1 100644
--- a/share/completions/rbenv.fish
+++ b/share/completions/rbenv.fish
@@ -2,7 +2,7 @@
 
 function __fish_rbenv_needs_command
   set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 -a $cmd[1] = 'rbenv' ]
+  if [ (count $cmd) -eq 1 ]
     return 0
   end
 
diff --git a/share/completions/ruby-build.fish b/share/completions/ruby-build.fish
index 3941df84..2489a09f 100644
--- a/share/completions/ruby-build.fish
+++ b/share/completions/ruby-build.fish
@@ -1,6 +1,6 @@
 function __fish_ruby-build_needs_command
   set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 -a $cmd[1] = 'ruby-build' ]
+  if [ (count $cmd) -eq 1 ]
     return 0
   end
   return 1
diff --git a/share/completions/travis.fish b/share/completions/travis.fish
index d53cc019..2811d876 100644
--- a/share/completions/travis.fish
+++ b/share/completions/travis.fish
@@ -1,6 +1,6 @@
 function __fish_travis_needs_command
   set cmd (commandline -opc)
-  if [ (count $cmd) -eq 1 -a $cmd[1] = 'travis' ]
+  if [ (count $cmd) -eq 1 ]
     return 0
   end
   return 1
-- 
cgit v1.2.3