nw-builder 4.3.11 → 4.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nw-builder",
-  "version": "4.3.11",
+  "version": "4.4.1",
   "description": "Build NW.js desktop applications for MacOS, Windows and Linux.",
   "keywords": [
     "NW.js",

package/src/get_ffmpeg.js

@@ -63,9 +63,35 @@ export async function get_ffmpeg({
     });
   }
 
+  const unzipFFMPeg = async () => {
+    if (platform === "linux") {
+      await compressing.tgz.uncompress(out, nwDir);
+    } else {
+      await compressing.zip.uncompress(out, nwDir);
+    }
+    let ffmpegFile;
+    if (platform === "linux") {
+      ffmpegFile = "libffmpeg.so";
+    } else if (platform === "win") {
+      ffmpegFile = "ffmpeg.dll";
+    } else if (platform === "osx") {
+      ffmpegFile = "libffmpeg.dylib";
+    }
+    await replaceFfmpeg(platform, nwDir, ffmpegFile);
+
+    if (cache === false) {
+      log.debug(`Removing FFMPEG zip cache`);
+      await rm(out, {
+        recursive: true,
+        force: true,
+      });
+      log.debug(`FFMPEG zip cache removed`);
+    }
+  };
   // Check if cache exists.
   if (existsSync(out)) {
     log.debug(`Found existing FFMPEG cache`);
+    await unzipFFMPeg();
     return;
   }
 
@@ -94,11 +120,7 @@ export async function get_ffmpeg({
         response.on("end", () => {
           log.debug(`FFMPEG fully downloaded`);
           bar.stop();
-          if (platform === "linux") {
-            compressing.tgz.uncompress(out, nwDir).then(() => resolve());
-          } else {
-            compressing.zip.uncompress(out, nwDir).then(() => resolve());
-          }
+          resolve();
         });
 
         response.pipe(stream);
@@ -111,24 +133,5 @@ export async function get_ffmpeg({
   });
 
   // Remove compressed file after download and decompress.
-  return request.then(async () => {
-    let ffmpegFile;
-    if (platform === "linux") {
-      ffmpegFile = "libffmpeg.so";
-    } else if (platform === "win") {
-      ffmpegFile = "ffmpeg.dll";
-    } else if (platform === "osx") {
-      ffmpegFile = "libffmpeg.dylib";
-    }
-    await replaceFfmpeg(platform, nwDir, ffmpegFile);
-
-    if (cache === false) {
-      log.debug(`Removing FFMPEG zip cache`);
-      await rm(out, {
-        recursive: true,
-        force: true,
-      });
-      log.debug(`FFMPEG zip cache removed`);
-    }
-  });
+  return request.then(unzipFFMPeg);
 }

package/src/index.js

@@ -93,10 +93,13 @@ const nwbuild = async (options) => {
     options.version = releaseInfo.version.slice(1);
 
     if (options.logLevel === "debug") {
-      log.debug(`Platform: ${platform}`);
-      log.debug(`Archicture: ${arch}`);
+      log.debug(`System Platform: ${platform}`);
+      log.debug(`System Architecture: ${arch}`);
       log.debug(`Node Version: ${version}`);
-      log.debug(`NW.js Version: ${options.version}\n`);
+      log.debug(`Build NW.js Version: ${options.version}`);
+      log.debug(`Build Flavor: ${options.flavor}`);
+      log.debug(`Build Platform: ${options.platform}`);
+      log.debug(`Build Architecture: ${options.arch}`);
     }
 
     nwDir = resolve(

package/src/run.js

@@ -54,7 +54,7 @@ export async function run({
       // It is assumed that the package.json is located at srcDir/package.json
       const nwProcess = spawn(
         resolve(nwDir, EXE_NAME[platform]),
-        [srcDir.concat(argv)],
+        [...[srcDir], ...argv],
         {
           detached: true,
           windowsHide: true,