From cce36624dc5cb6d4640fb08d4ebbce8a11188c31 Mon Sep 17 00:00:00 2001
From: Florian Sundermann <boombuler@gmail.com>
Date: Wed, 28 Sep 2016 16:34:28 +0200
Subject: [PATCH] PM should not install already installed plugins.

---
 cmd/micro/pluginmanager.go | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/cmd/micro/pluginmanager.go b/cmd/micro/pluginmanager.go
index 1e00f6db..969c29c7 100644
--- a/cmd/micro/pluginmanager.go
+++ b/cmd/micro/pluginmanager.go
@@ -320,6 +320,7 @@ func GetInstalledPluginVersion(name string) string {
 }
 
 func (pv *PluginVersion) DownloadAndInstall() error {
+	messenger.AddLog(fmt.Sprintf("Downloading %q (%s) from %q", pv.pack.Name, pv.Version, pv.Url))
 	resp, err := http.Get(pv.Url)
 	if err != nil {
 		return err
@@ -440,17 +441,27 @@ func (all PluginPackages) Resolve(selectedVersions PluginVersions, open PluginDe
 
 func (versions PluginVersions) install() {
 	anyInstalled := false
+	currentlyInstalled := GetInstalledVersions()
+
 	for _, sel := range versions {
 		if sel.pack.Name != CorePluginName {
-			installed := GetInstalledPluginVersion(sel.pack.Name)
-			if v, err := semver.ParseTolerant(installed); err != nil || v.NE(sel.Version) {
-				UninstallPlugin(sel.pack.Name)
+			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))
+					UninstallPlugin(sel.pack.Name)
+				} else {
+					shouldInstall = false
+				}
 			}
-			if err := sel.DownloadAndInstall(); err != nil {
-				messenger.Error(err)
-				return
+
+			if shouldInstall {
+				if err := sel.DownloadAndInstall(); err != nil {
+					messenger.Error(err)
+					return
+				}
+				anyInstalled = true
 			}
-			anyInstalled = true
 		}
 	}
 	if anyInstalled {