From 39c02508336bb261557cf90510f5fb03529ceedd Mon Sep 17 00:00:00 2001
From: Jin <22962980+JYC333@users.noreply.github.com>
Date: Mon, 5 Aug 2024 20:20:35 +0200
Subject: [PATCH] fix server package

---
 bin/copy-trilium.sh | 2 +-
 forge.config.cjs    | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh
index 59dbb8f5a..25b881dd7 100755
--- a/bin/copy-trilium.sh
+++ b/bin/copy-trilium.sh
@@ -44,7 +44,7 @@ cp -R "$script_dir/../build/src" "$DIR"
 cp "$script_dir/../build/electron.js" "$DIR"
 
 # run in subshell (so we return to original dir)
-(cd $DIR && npm install --omit=dev && npx electron-rebuild)
+(cd $DIR && npm install --omit=dev)
 
 if [[ -d "$DIR"/node_modules ]]; then
     # cleanup of useless files in dependencies
diff --git a/forge.config.cjs b/forge.config.cjs
index ee2d6a78e..5d4693d4b 100644
--- a/forge.config.cjs
+++ b/forge.config.cjs
@@ -4,13 +4,12 @@ const fs = require('fs-extra');
 module.exports = {
   packagerConfig: {
     executableName: "trilium",
-    name: 'trilium',
+    name: 'TriliumNextNotes',
     overwrite: true,
     asar: true,
     // icon will break once we add .dmg support, since the .ico & .icns have to be in same dir (see https://www.electronforge.io/guides/create-and-add-icons#windows-and-macos)
     icon: "./images/app-icons/icon",
     extraResource: getExtraResourcesForPlatform(),
-    files: [{ from: './bin/tpl/anonymize-database.tql', to: '.' }],
     afterComplete: [(buildPath, electronVersion, platform, arch, callback) => {
       const extraResources = getExtraResourcesForPlatform();
       for (const resource of extraResources) {
@@ -48,7 +47,7 @@ module.exports = {
       name: '@electron-forge/maker-dmg',
       arch: ['x64', 'arm64'],
       config: {
-        icon: "./images/app-icons/mac/icon.icns",
+        icon: "./images/app-icons/icon.icns",
       }
     },
     {
@@ -56,8 +55,7 @@ module.exports = {
       config: {
         options: {
           iconUrl: "https://raw.githubusercontent.com/TriliumNext/Notes/develop/images/app-icons/icon.ico",
-          setupIcon: "./images/app-icons/icon.ico",
-          loadingGif: "./images/app-icons/win/setup-banner.gif"
+          icon: "./images/app-icons/icon.ico",
         }
       }
     }