fix: copy ffmpeg to correct path after extract (#918)

changelog.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [4.3.7] - 2023-08-11
+
+### Changed
+
+- Move community `ffmpeg` in the correct folder.
+
 ## [4.3.6] - 2023-08-11
 
 ### Changed

package.json

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

src/get.js

@@ -181,7 +181,15 @@ export async function get({
     // Remove compressed file after download and decompress.
     return request.then(async () => {
       if (ffmpeg === true) {
-        await replaceFfmpeg(platform, nwDir, out);
+        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);
       }
 
       log.debug(`Binary decompressed starting removal`);

src/util/ffmpeg.js

@@ -9,22 +9,25 @@ import { resolve } from "node:path";
  * @param {string} ffmpegFile  The path to the ffmpeg file to replace with
  */
 export const replaceFfmpeg = async (platform, nwDir, ffmpegFile) => {
+  const src = resolve(nwDir, ffmpegFile);
   if (platform === "linux") {
-    await copyFile(ffmpegFile, resolve(nwDir, "lib", ffmpegFile));
+    const dest = resolve(nwDir, "lib", ffmpegFile);
+    await copyFile(src, dest);
   } else if (platform === "win") {
-    await copyFile(ffmpegFile, resolve(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") {
-    await copyFile(
+    const dest = resolve(
+      nwDir,
+      "nwjs.app",
+      "Contents",
+      "Frameworks",
+      "nwjs Framework.framework",
+      "Versions",
+      "Current",
       ffmpegFile,
-      resolve(
-        nwDir,
-        "Contents",
-        "Frameworks",
-        "nwjs Framework.framework",
-        "Versions",
-        "Current",
-        ffmpegFile,
-      ),
     );
+
+    await copyFile(src, dest);
   }
 };