Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-02-01 03:59:15 +01:00
Code Issues Packages Projects Releases Activity

fix(desktop): nightly icon not respected

Browse Source
This commit is contained in:
Elian Doran
2026-01-28 10:03:45 +02:00
parent bd45043a36
commit 85bf1eb4ec
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
apps/server/src/assets/icon-dev.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 KiB

4
apps/server/src/services/window.ts
View File

@@ -4,6 +4,7 @@ import { t } from "i18next";
import path from "path";
import url from "url";
import app_info from "./app_info.js";
import cls from "./cls.js";
import keyboardActionsService from "./keyboard_actions.js";
import log from "./log.js";
@@ -290,6 +291,9 @@ function getIcon() {
if (process.env.NODE_ENV === "development") {
return path.join(__dirname, "../../../desktop/electron-forge/app-icon/png/256x256-dev.png");
}
if (app_info.appVersion.includes("test")) {
return path.join(RESOURCE_DIR, "../public/assets/icon-dev.png");
}
return path.join(RESOURCE_DIR, "../public/assets/icon.png");
}

7
scripts/icons/create-icons.sh
View File

@@ -70,4 +70,9 @@ magick -background none "$source_icon_dir/icon-installer-purple.svg" -define ico
# Build Squirrel splash image
magick "./png/256x256.png" -background "#ffffff" -gravity center -extent 640x480 "$desktop_forge_dir/setup-icon/setup-banner.gif"
magick "./png/256x256-dev.png" -background "#ffffff" -gravity center -extent 640x480 "$desktop_forge_dir/setup-icon/setup-banner-dev.gif"
magick "./png/256x256-dev.png" -background "#ffffff" -gravity center -extent 640x480 "$desktop_forge_dir/setup-icon/setup-banner-dev.gif"
# Copy server assets
server_dir="$script_dir/../../apps/server"
cp "$desktop_forge_dir/app-icon/icon.ico" "$server_dir/src/assets/icon.ico"
cp "$desktop_forge_dir/app-icon/icon-dev.ico" "$server_dir/src/assets/icon-dev.ico"