4 files changed, 108 insertions, 3 deletions

diff --git a/vendor/github.com/posener/complete/cmd/cmd.go b/vendor/github.com/posener/complete/cmd/cmd.go
index 7137dee..b99fe52 100644
--- a/vendor/github.com/posener/complete/cmd/cmd.go
+++ b/vendor/github.com/posener/complete/cmd/cmd.go
@@ -103,7 +103,7 @@ func (f *CLI) AddFlags(flags *flag.FlagSet) {
                         fmt.Sprintf("Uninstall completion for %s command", f.Name))
         }
         if flags.Lookup("y") == nil {
-                flags.BoolVar(&f.yes, "y", false, "Don't prompt user for typing 'yes'")
+                flags.BoolVar(&f.yes, "y", false, "Don't prompt user for typing 'yes' when installing completion")
         }
 }
 
diff --git a/vendor/github.com/posener/complete/cmd/install/fish.go b/vendor/github.com/posener/complete/cmd/install/fish.go
new file mode 100644
index 0000000..6467196
--- /dev/null
+++ b/vendor/github.com/posener/complete/cmd/install/fish.go
@@ -0,0 +1,56 @@
+package install
+
+import (
+        "bytes"
+        "fmt"
+        "os"
+        "path/filepath"
+        "text/template"
+)
+
+// (un)install in fish
+
+type fish struct {
+        configDir string
+}
+
+func (f fish) Install(cmd, bin string) error {
+        completionFile := filepath.Join(f.configDir, "completions", fmt.Sprintf("%s.fish", cmd))
+        completeCmd, err := f.cmd(cmd, bin)
+        if err != nil {
+                return err
+        }
+        if _, err := os.Stat(completionFile); err == nil {
+                return fmt.Errorf("already installed at %s", completionFile)
+        }
+
+        return createFile(completionFile, completeCmd)
+}
+
+func (f fish) Uninstall(cmd, bin string) error {
+        completionFile := filepath.Join(f.configDir, "completions", fmt.Sprintf("%s.fish", cmd))
+        if _, err := os.Stat(completionFile); err != nil {
+                return fmt.Errorf("does not installed in %s", f.configDir)
+        }
+
+        return os.Remove(completionFile)
+}
+
+func (f fish) cmd(cmd, bin string) (string, error) {
+        var buf bytes.Buffer
+        params := struct{ Cmd, Bin string }{cmd, bin}
+        tmpl := template.Must(template.New("cmd").Parse(`
+function __complete_{{.Cmd}}
+    set -lx COMP_LINE (string join ' ' (commandline -o))
+    test (commandline -ct) = ""
+    and set COMP_LINE "$COMP_LINE "
+    {{.Bin}}
+end
+complete -c {{.Cmd}} -a "(__complete_{{.Cmd}})"
+`))
+        err := tmpl.Execute(&buf, params)
+        if err != nil {
+                return "", err
+        }
+        return buf.String(), nil
+}
diff --git a/vendor/github.com/posener/complete/cmd/install/install.go b/vendor/github.com/posener/complete/cmd/install/install.go
index 082a226..dfa1963 100644
--- a/vendor/github.com/posener/complete/cmd/install/install.go
+++ b/vendor/github.com/posener/complete/cmd/install/install.go
@@ -51,7 +51,7 @@ func Uninstall(cmd string) error {
         for _, i := range is {
                 errI := i.Uninstall(cmd, bin)
                 if errI != nil {
-                        multierror.Append(err, errI)
+                        err = multierror.Append(err, errI)
                 }
         }
 
@@ -68,9 +68,36 @@ func installers() (i []installer) {
         if f := rcFile(".zshrc"); f != "" {
                 i = append(i, zsh{f})
         }
+        if d := fishConfigDir(); d != "" {
+                i = append(i, fish{d})
+        }
         return
 }
 
+func fishConfigDir() string {
+        configDir := filepath.Join(getConfigHomePath(), "fish")
+        if configDir == "" {
+                return ""
+        }
+        if info, err := os.Stat(configDir); err != nil || !info.IsDir() {
+                return ""
+        }
+        return configDir
+}
+
+func getConfigHomePath() string {
+        u, err := user.Current()
+        if err != nil {
+                return ""
+        }
+
+        configHome := os.Getenv("XDG_CONFIG_HOME")
+        if configHome == "" {
+                return filepath.Join(u.HomeDir, ".config")
+        }
+        return configHome
+}
+
 func getBinaryPath() (string, error) {
         bin, err := os.Executable()
         if err != nil {
diff --git a/vendor/github.com/posener/complete/cmd/install/utils.go b/vendor/github.com/posener/complete/cmd/install/utils.go
index 2c8b44c..d34ac8c 100644
--- a/vendor/github.com/posener/complete/cmd/install/utils.go
+++ b/vendor/github.com/posener/complete/cmd/install/utils.go
@@ -6,6 +6,7 @@ import (
         "io"
         "io/ioutil"
         "os"
+        "path/filepath"
 )
 
 func lineInFile(name string, lookFor string) bool {
@@ -36,6 +37,24 @@ func lineInFile(name string, lookFor string) bool {
         }
 }
 
+func createFile(name string, content string) error {
+        // make sure file directory exists
+        if err := os.MkdirAll(filepath.Dir(name), 0775); err != nil {
+                return err
+        }
+
+        // create the file
+        f, err := os.Create(name)
+        if err != nil {
+                return err
+        }
+        defer f.Close()
+
+        // write file content
+        _, err = f.WriteString(fmt.Sprintf("%s\n", content))
+        return err
+}
+
 func appendToFile(name string, content string) error {
         f, err := os.OpenFile(name, os.O_RDWR|os.O_APPEND, 0)
         if err != nil {
@@ -96,7 +115,10 @@ func removeContentToTempFile(name, content string) (string, error) {
                 if str == content {
                         continue
                 }
-                wf.WriteString(str + "\n")
+                _, err = wf.WriteString(str + "\n")
+                if err != nil {
+                        return "", err
+                }
                 prefix = prefix[:0]
         }
         return wf.Name(), nil