From 3fd45b15e7042c12f140524297b50677f9851044 Mon Sep 17 00:00:00 2001 From: azivner Date: Mon, 19 Nov 2018 17:16:22 +0100 Subject: [PATCH] set icon and app name, closes #201 --- bin/build.sh | 12 +++++++++--- electron.js | 2 ++ package.json | 4 +--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 2ce661275..362be1b37 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -11,15 +11,21 @@ rm -r dist/* echo "Rebuilding binaries for linux-ia32" ./node_modules/.bin/electron-rebuild --arch=ia32 -./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=ia32 --overwrite +./node_modules/.bin/electron-packager . --out=dist --executable-name=trilium --platform=linux --arch=ia32 --overwrite -./node_modules/.bin/electron-packager . --out=dist --platform=win32 --arch=x64 --overwrite +mv "./dist/Trilium Notes-linux-ia32" ./dist/trilium-linux-ia32 + +./node_modules/.bin/electron-packager . --out=dist --executable-name=trilium --platform=win32 --arch=x64 --overwrite --icon=src/public/images/app-icons/win/icon.ico + +mv "./dist/Trilium Notes-win32-x64" ./dist/trilium-win32-x64 # we build x64 as second so that we keep X64 binaries in node_modules for local development and server build echo "Rebuilding binaries for linux-x64" ./node_modules/.bin/electron-rebuild --arch=x64 -./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=x64 --overwrite +./node_modules/.bin/electron-packager . --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite + +mv "./dist/Trilium Notes-linux-x64" ./dist/trilium-linux-x64 echo "Copying required windows binaries" diff --git a/electron.js b/electron.js index 04ae7a285..560644cb4 100644 --- a/electron.js +++ b/electron.js @@ -70,6 +70,8 @@ app.on('activate', () => { }); app.on('ready', async () => { + app.setAppUserModelId('com.github.zadam.trilium'); + mainWindow = await createMainWindow(); const result = globalShortcut.register('CommandOrControl+Alt+P', cls.wrap(async () => { diff --git a/package.json b/package.json index 8db13efad..00c9c47b4 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "name": "trilium", + "productName": "Trilium Notes", "description": "Trilium Notes", "version": "0.24.1-beta", "license": "AGPL-3.0-only", @@ -13,10 +14,7 @@ }, "scripts": { "start": "node ./src/www", - "test-electron": "xo", - "rebuild-electron": "electron-rebuild", "start-electron": "electron . --disable-gpu", - "build-electron": "electron-packager . --out=dist --asar --overwrite --platform=win32,linux --arch=ia32,x64 --app-version= --icon=src/public/app-icons/win/icon.ico", "build-backend-docs": "jsdoc -d ./docs/backend_api src/entities/*.js src/services/backend_script_api.js", "build-frontend-docs": "jsdoc -d ./docs/frontend_api src/public/javascripts/entities/*.js src/public/javascripts/services/frontend_script_api.js", "build-docs": "npm run build-backend-docs && npm run build-frontend-docs"