@saltcorn/plugins-loader 0.9.5-beta.13 → 0.9.5-beta.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/plugins-loader",
-  "version": "0.9.5-beta.13",
+  "version": "0.9.5-beta.15",
   "description": "Saltcorn plugin loader",
   "homepage": "https://saltcorn.com",
   "scripts": {
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "env-paths": "^2.2.0",
-    "@saltcorn/data": "0.9.5-beta.13"
+    "@saltcorn/data": "0.9.5-beta.15"
   },
   "author": "Christian Hugo",
   "license": "MIT",

package/plugin_installer.js

@@ -88,7 +88,7 @@ class PluginInstaller {
       version: pckJSON.version,
       plugin_module: module,
       location: this.pluginDir,
-      name: this.name,
+      name: this.plugin.name,
       loadedWithReload,
     };
   }
@@ -199,6 +199,7 @@ class PluginInstaller {
   }
 
   async npmInstall(pckJSON) {
+    getState().log(5, `NPM install plugin: ${pckJSON.name}`);
     const isWindows = process.platform === "win32";
     if (
       Object.keys(pckJSON.dependencies || {}).length > 0 ||
@@ -222,12 +223,24 @@ class PluginInstaller {
 
   async movePlugin() {
     const isWindows = process.platform === "win32";
+    const copyMove = async () => {
+      await cp(this.tempDir, this.pluginDir, { recursive: true, force: true });
+      try {
+        await rm(this.tempDir, { recursive: true });
+      } catch (error) {
+        getState().log(2, `Error removing temp folder ${this.tempDir}`);
+      }
+    };
     if (await pathExists(this.pluginDir))
       await rm(this.pluginDir, { recursive: true });
     await mkdir(this.pluginDir, { recursive: true });
-    if (!isWindows) await rename(this.tempDir, this.pluginDir);
-    else
-      await cp(this.tempDir, this.pluginDir, { recursive: true, force: true });
+    if (!isWindows) {
+      try {
+        await rename(this.tempDir, this.pluginDir);
+      } catch (error) {
+        await copyMove();
+      }
+    } else await copyMove();
   }
 }