Merge branch 'develop' into build_improve-electron-forge_v3

This commit is contained in:
Elian Doran 2025-03-15 17:00:53 +02:00 committed by GitHub
commit e9a0c68a28
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 12 deletions

View File

@ -1,11 +0,0 @@
[Desktop Entry]
<% if (productName) { %>Name=<%= productName %>
<% } %><% if (description) { %>Comment=<%= description %>
<% } %><% if (genericName) { %>GenericName=<%= genericName %>
<% } %><% if (desktopExec) { %>Exec=<%= desktopExec %> %U
<% } %><% if (id) { %>Icon=<%= id %>
<% } %>Type=Application
StartupNotify=true
<% if (categories && categories.length) { %>Categories=<%= categories.join(';') %>;
<% } %><% if (mimeType && mimeType.length) { %>MimeType=<%= mimeType.join(';') %>;
<% } %>

View File

@ -74,7 +74,6 @@ module.exports = {
config: {
options: {
...baseLinuxMakerConfigOptions,
desktopTemplate: path.resolve("./bin/electron-forge/desktop.ejs"),
id: "com.triliumnext.notes",
runtimeVersion: "24.08",
base: "org.electronjs.Electron2.BaseApp",