nw-builder 4.3.7 → 4.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nw-builder",
-  "version": "4.3.7",
+  "version": "4.3.9",
   "description": "Build NW.js desktop applications for MacOS, Windows and Linux.",
   "keywords": [
     "NW.js",
@@ -55,10 +55,10 @@
     "concurrently": "^8.2.0",
     "eslint": "^8.45.0",
     "eslint-config-tjw-jsdoc": "^1.0.3",
-    "gh-pages": "^5.0.0",
+    "gh-pages": "^6.0.0",
     "jsdoc": "^4.0.2",
     "jsdoc-to-markdown": "^8.0.0",
-    "prettier": "^3.0.0",
+    "prettier": "^3.0.1",
     "selenium-webdriver": "^4.10.0",
     "vitepress": "^1.0.0-beta.5"
   },

package/src/get.js

@@ -10,6 +10,7 @@ import compressing from "compressing";
 import { log } from "./log.js";
 import { PLATFORM_KV, ARCH_KV } from "./util.js";
 import { replaceFfmpeg } from "./util/ffmpeg.js";
+import child_process from "child_process";
 
 /**
  * _Note: This an internal function which is not called directly. Please see example usage below._
@@ -162,6 +163,22 @@ export async function get({
               compressing.tgz
                 .uncompress(out, ffmpeg ? nwDir : cacheDir)
                 .then(() => resolve());
+            } else if (platform === "osx") {
+              //TODO: compressing package does not restore symlinks on some macOS (eg: circleCI)
+              const exec = function (cmd) {
+                log.debug(cmd);
+                const result = child_process.spawnSync(cmd, {
+                  shell: true,
+                  stdio: "inherit",
+                });
+                if (result.status !== 0) {
+                  log.debug(`Command failed with status ${result.status}`);
+                  if (result.error) console.log(result.error);
+                  process.exit(1);
+                }
+                return resolve();
+              };
+              exec(`unzip -o "${out}" -d "${ffmpeg ? nwDir : cacheDir}"`);
             } else {
               compressing.zip
                 .uncompress(out, ffmpeg ? nwDir : cacheDir)

package/src/util/ffmpeg.js

@@ -17,7 +17,7 @@ export const replaceFfmpeg = async (platform, nwDir, ffmpegFile) => {
     // don't do anything for windows because the extracted file is already in the correct path
     // await copyFile(src, resolve(nwDir, ffmpegFile));
   } else if (platform === "osx") {
-    const dest = resolve(
+    let dest = resolve(
       nwDir,
       "nwjs.app",
       "Contents",
@@ -28,6 +28,21 @@ export const replaceFfmpeg = async (platform, nwDir, ffmpegFile) => {
       ffmpegFile,
     );
 
-    await copyFile(src, dest);
+    try {
+      await copyFile(src, dest);
+    } catch (e) {
+      //some versions of node/macOS complain about destination being a file, and others complain when it is only a directory.
+      //the only thing I can think to do is to try both
+      dest = resolve(
+        nwDir,
+        "nwjs.app",
+        "Contents",
+        "Frameworks",
+        "nwjs Framework.framework",
+        "Versions",
+        "Current",
+      );
+      await copyFile(src, dest);
+    }
   }
 };