mirror of
				https://github.com/TriliumNext/Notes.git
				synced 2025-10-31 21:11:30 +08:00 
			
		
		
		
	Merge branch 'develop' into build_improve-electron-forge_v3
This commit is contained in:
		
						commit
						e9a0c68a28
					
				| @ -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(';') %>; | ||||
| <% } %> | ||||
| @ -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", | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Elian Doran
						Elian Doran