From 6a8a47cf0394bd5ad1eda56c1f0ec8af06a17fb2 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Wed, 20 Jan 2021 16:54:23 +0100
Subject: [PATCH] fix in autoinstall

---
 packages/api/src/controllers/plugins.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/api/src/controllers/plugins.js b/packages/api/src/controllers/plugins.js
index db18262eb..75981d768 100644
--- a/packages/api/src/controllers/plugins.js
+++ b/packages/api/src/controllers/plugins.js
@@ -168,21 +168,31 @@ module.exports = {
     } catch (err) {
       this.removedPlugins = [];
     }
+
     for (const packageName of Object.keys(preinstallPluginMinimalVersions)) {
-      if (this.removedPlugins.includes(packageName)) continue;
       const installedVersion = installed.find((x) => x.name == packageName);
       if (installedVersion) {
+        // plugin installed, test, whether upgrade
         const requiredVersion = preinstallPluginMinimalVersions[packageName];
         if (compareVersions(installedVersion.version, requiredVersion) < 0) {
           console.log(
-            `Upgrading preinstalled plugin, found ${installedVersion.version}, required version ${requiredVersion}`,
-            packageName
+            `Upgrading preinstalled plugin ${packageName}, found ${installedVersion.version}, required version ${requiredVersion}`
           );
           await this.upgrade({ packageName });
+        } else {
+          console.log(
+            `Plugin ${packageName} not upgraded, found ${installedVersion.version}, required version ${requiredVersion}`
+          );
         }
 
         continue;
       }
+
+      if (this.removedPlugins.includes(packageName)) {
+        // plugin was remvoed, don't install again
+        continue;
+      }
+
       try {
         console.log('Preinstalling plugin', packageName);
         await this.install({ packageName });