more build fixes

Nexus-Mods · Jun 14, 2017 · bf602c6 · bf602c6
1 parent 739fb12
commit bf602c6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 27 deletions.
diff --git a/InstallAssets.js b/InstallAssets.js
@@ -56,31 +56,29 @@ for (let file of data.copy) {
     continue;
   }
 
-  fs.ensureDirAsync(path.join(tgt, file.outPath))
-    .then(() => {
       glob(file.srcPath, globOptions, (globErr, files) => {
-        copies = copies === -1 ? files.length : copies += files.length;
-        if (globErr !== null) {
-          console.err('glob failed', globErr);
+      copies = copies === -1 ? files.length : copies += files.length;
+      if (globErr !== null) {
+        console.err('glob failed', globErr);
+      }
+      return Promise.map(files, (globResult) => {
+        let globTarget = path.join(...globResult.split(/[\/\\]/).slice(file.skipPaths));
+        if (file.rename) {
+          globTarget = path.join(path.dirname(globTarget), file.rename);
         }
-        return Promise.map(files, (globResult) => {
-          let globTarget = path.join(...globResult.split(/[\/\\]/).slice(file.skipPaths));
-          if (file.rename) {
-            globTarget = path.join(path.dirname(globTarget), file.rename);
-          }
-          const targetFile = path.join(tgt, file.outPath, globTarget);
+        const targetFile = path.join(tgt, file.outPath, globTarget);
 
-          return fs.copyAsync(globResult, targetFile)
-            .then(() => {
-              console.log('copied', globResult, targetFile);
-            })
-            .catch((copyErr) => {
-              console.log('failed to copy', globResult, targetFile, copyErr);
-            })
-            .finally(() => {
-              --copies;
-            });
-        });
+        return fs.ensureDirAsync(path.dirname(targetFile))
+          .then(() => fs.copyAsync(globResult, targetFile))
+          .then(() => {
+            console.log('copied', globResult, targetFile);
+          })
+          .catch((copyErr) => {
+            console.log('failed to copy', globResult, targetFile, copyErr);
+          })
+          .finally(() => {
+            --copies;
+          });
       });
     });
 }

diff --git a/InstallAssets.json b/InstallAssets.json
@@ -105,7 +105,7 @@
       ]
     },
     {
-      "srcPath": "extensions/*/index.js",
+      "srcPath": "extensions/game-*/*",
       "outPath": "bundledPlugins",
       "skipPaths": 1,
       "target": [
@@ -114,7 +114,7 @@
       ]
     },
     {
-      "srcPath": "extensions/game-*/*",
+      "srcPath": "extensions/*/index.js",
       "outPath": "bundledPlugins",
       "skipPaths": 1,
       "target": [

diff --git a/extensions/theme-switcher/package.json b/extensions/theme-switcher/package.json
@@ -8,7 +8,7 @@
     "webpack": "node ./node_modules/webpack/bin/webpack --config webpack.config.js --display-error-details --progress --profile --color",
     "postinstall": "electron-rebuild -w font-manager",
     "prebuild": "typings prune && typings install",
-    "build": "npm run tsc && copyfiles -f ./node_modules/font-manager/build/Release/fontmanager.node ./dist && npm run webpack"
+    "build": "npm run tsc && copy \".\\node_modules\\font-manager\\build\\Release\\fontmanager.node\" \".\\dist\\font-manager.node\" && npm run webpack"
   },
   "author": "Black Tree Gaming Ltd.",
   "license": "GPL-3.0",
@@ -20,7 +20,7 @@
     "@types/react-redux": "4.4.35",
     "@types/redux": "^3.6.0",
     "@types/redux-thunk": "^2.1.0",
-    "copyfiles": "^1.2.0",
+    "copy": "^0.3.0",
     "electron-rebuild": "^1.5.11",
     "webpack": "^1.13.2"
   },

diff --git a/src/util/ExtensionManager.ts b/src/util/ExtensionManager.ts
@@ -67,6 +67,10 @@ if (remote !== undefined) {
 process.env.NODE_PATH = path.resolve(__dirname, '..', '..', 'node_modules');
 Module._initPaths();
 
+function asarUnpacked(input: string): string {
+  return input.replace('app.asar' + path.sep, 'app.asar.unpacked' + path.sep);
+}
+
 interface IRegisteredExtension {
   name: string;
   path: string;
@@ -772,7 +776,7 @@ class ExtensionManager {
       'test_runner',
     ];
 
-    const bundledPath = path.resolve(__dirname, '..', 'bundledPlugins');
+    const bundledPath = asarUnpacked(path.resolve(__dirname, '..', 'bundledPlugins'));
     log('info', 'bundle at', bundledPath);
     const extensionsPath = path.join(app.getPath('userData'), 'plugins');
     return staticExtensions