From 82e9b0bd6a9ef73019847a5eb74857939e3c18c3 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuel@fancy.org.uk>
Date: Tue, 12 Mar 2019 19:47:55 +0000
Subject: [PATCH] Fix packed plugins

---
 client/src/modules/packageinstaller.js | 11 +++--------
 client/src/modules/pluginmanager.js    | 14 +-------------
 client/src/modules/thememanager.js     |  7 +------
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/client/src/modules/packageinstaller.js b/client/src/modules/packageinstaller.js
index 8c505f1b..278632f2 100644
--- a/client/src/modules/packageinstaller.js
+++ b/client/src/modules/packageinstaller.js
@@ -84,15 +84,10 @@ export default class PackageInstaller {
 
             await oldContent.unload(true);
 
-            if (oldContent.packed && oldContent.packed.packageName !== nameOrId) {
-                rimraf(oldContent.packed.packagePath, err => {
-                    if (err) throw err;
-                });
-            } else {
-                rimraf(oldContent.contentPath, err => {
-                    if (err) throw err;
-                });
+            if (oldContent.packed && oldContent.packageName !== nameOrId) {
+                await FileUtils.deleteFile(oldContent.packagePath).catch(err => null);
             }
+            await FileUtils.recursiveDeleteDirectory(oldContent.contentPath).catch(err => null);
 
             return manager.preloadPackedContent(outputName);
         } catch (err) {
diff --git a/client/src/modules/pluginmanager.js b/client/src/modules/pluginmanager.js
index 3778412f..a78d4090 100644
--- a/client/src/modules/pluginmanager.js
+++ b/client/src/modules/pluginmanager.js
@@ -109,21 +109,9 @@ export default class extends ContentManager {
             throw {message: `Plugin ${info.name} did not return a class that extends Plugin.`};
 
         const instance = new plugin({
-            configs, info, main,
-            paths: {
-                contentPath: paths.contentPath,
-                dirName: packed ? packed.packageName : paths.dirName,
-                mainPath: paths.mainPath
-            }
+            configs, info, main, paths
         });
 
-        if (packed) instance.packed = {
-            pkg: packed.pkg,
-            packageName: packed.packageName,
-            packagePath: packed.packagePath,
-            packed: true
-        }; else instance.packed = false;
-
         if (instance.enabled && this.loaded) {
             instance.userConfig.enabled = false;
             instance.start(false);
diff --git a/client/src/modules/thememanager.js b/client/src/modules/thememanager.js
index 3ed2b3f7..f97e4778 100644
--- a/client/src/modules/thememanager.js
+++ b/client/src/modules/thememanager.js
@@ -36,12 +36,7 @@ export default class ThemeManager extends ContentManager {
     static async loadTheme(paths, configs, info, main) {
         try {
             const instance = new Theme({
-                configs, info, main,
-                paths: {
-                    contentPath: paths.contentPath,
-                    dirName: paths.dirName,
-                    mainPath: paths.mainPath
-                }
+                configs, info, main, paths
             });
             if (instance.enabled) {
                 instance.userConfig.enabled = false;