fix(bld): parse options.app.icon correctly during build mode

nwutils · Nov 25, 2024 · bd0ef96 · bd0ef96
1 parent 6ab1ea3
commit bd0ef96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/bld.js b/src/bld.js
@@ -256,7 +256,7 @@ const setLinuxConfig = async ({ app, outDir }) => {
     GenericName: app.genericName,
     NoDisplay: app.noDisplay,
     Comment: app.comment,
-    Icon: path.resolve(outDir, 'package.nw', path.basename(app.icon)),
+    Icon: app.icon ? path.resolve(outDir, 'package.nw', app.icon) : '',
     Hidden: app.hidden,
     OnlyShowIn: app.onlyShowIn,
     NotShowIn: app.notShowIn,

diff --git a/src/util.js b/src/util.js
@@ -239,7 +239,7 @@ export const parse = async (options, pkg) => {
     options.app.name = options.app.name.replace(/[<>:"/\\|?*\u0000-\u001F]/g, '');
   }
   /* Path to where the icon currently is in the filesystem */
-  options.app.icon = options.app.icon ?? undefined;
+  options.app.icon = options.app.icon ?? pkg.window?.icon ?? undefined;
   if (options.app.icon) {
     options.app.icon = path.resolve(options.app.icon);
   }