Merge pull request #1135 from whilei/gofmt-2018-Jun-17-00-39

[micro.git] / cmd / micro / pluginmanager.go

diff --git a/cmd/micro/pluginmanager.go b/cmd/micro/pluginmanager.go
index db611fadbda006127a66b5d15b2b66108f9830f8..ad7843e654cc241132ad3f1a52bc5426002d5ee0 100644 (file)
--- a/cmd/micro/pluginmanager.go
+++ b/cmd/micro/pluginmanager.go
@@ -8,7 +8,6 @@ import (
        "io/ioutil"
        "net/http"
        "os"
-       "path"
        "path/filepath"
        "sort"
        "strings"
@@ -423,6 +422,7 @@ func (pv *PluginVersion) DownloadAndInstall() error {
                }
        }
 
+       // Install files and directory's
        for _, f := range z.File {
                parts := strings.Split(f.Name, "/")
                if allPrefixed {
@@ -435,7 +435,7 @@ func (pv *PluginVersion) DownloadAndInstall() error {
                                return err
                        }
                } else {
-                       basepath := path.Dir(targetName)
+                       basepath := filepath.Dir(targetName)
 
                        if err := os.MkdirAll(basepath, dirPerm); err != nil {
                                return err
@@ -541,7 +541,7 @@ func (pv PluginVersions) install() {
                        shouldInstall := true
                        if pv := currentlyInstalled.find(sel.pack.Name); pv != nil {
                                if pv.Version.NE(sel.Version) {
-                                       messenger.AddLog(fmt.Sprint("Uninstalling %q", sel.pack.Name))
+                                       messenger.AddLog("Uninstalling", sel.pack.Name)
                                        UninstallPlugin(sel.pack.Name)
                                } else {
                                        shouldInstall = false