gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix icon in desktop linux build, fixes #372

Browse Source
This commit is contained in:
azivner 2019-01-22 19:49:33 +01:00
parent 9d42c3d802
commit 484715e440
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/build-linux-x64.sh
View File

@ -11,6 +11,8 @@ cp -r bin/deps/linux-x64/sqlite/* node_modules/sqlite3/lib/binding/
mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR
cp src/public/images/app-icons/png/128x128.png $BUILD_DIR/icon.png
# removing software WebGL binaries because they are pretty huge and not necessary # removing software WebGL binaries because they are pretty huge and not necessary
rm -r $BUILD_DIR/swiftshader rm -r $BUILD_DIR/swiftshader

6
src/services/app_icon.js
View File

@ -1,7 +1,7 @@
"use strict"; "use strict";
const path = require('path'); const path = require('path');
const {APP_PNG_ICON_DIR, ELECTRON_APP_ROOT_DIR} = require("./resource_dir"); const {ELECTRON_APP_ROOT_DIR} = require("./resource_dir");
const log = require("./log"); const log = require("./log");
const os = require('os'); const os = require('os');
const fs = require('fs'); const fs = require('fs');
@ -11,7 +11,7 @@ const utils = require('./utils');
const template = `[Desktop Entry] const template = `[Desktop Entry]
Type=Application Type=Application
Name=Trilium Notes Name=Trilium Notes
Icon=#APP_PNG_ICON_DIR#/128x128.png Icon=#APP_ROOT_DIR#/icon.png
Exec=#EXE_PATH# Exec=#EXE_PATH#
Categories=Office Categories=Office
Terminal=false Terminal=false
@ -50,7 +50,7 @@ function installLocalAppIcon() {
function getDesktopFileContent() { function getDesktopFileContent() {
return template return template
.replace("#APP_PNG_ICON_DIR#", escapePath(APP_PNG_ICON_DIR)) .replace("#APP_ROOT_DIR#", escapePath(ELECTRON_APP_ROOT_DIR))
.replace("#EXE_PATH#", escapePath(getExePath())); .replace("#EXE_PATH#", escapePath(getExePath()));
} }

4
src/services/resource_dir.js
View File

@ -7,7 +7,6 @@ const RESOURCE_DIR = path.resolve(__dirname, "../..");
// where "trilium" executable is // where "trilium" executable is
const ELECTRON_APP_ROOT_DIR = path.resolve(RESOURCE_DIR, "../.."); const ELECTRON_APP_ROOT_DIR = path.resolve(RESOURCE_DIR, "../..");
const DB_INIT_DIR = path.resolve(RESOURCE_DIR, "db"); const DB_INIT_DIR = path.resolve(RESOURCE_DIR, "db");
const APP_PNG_ICON_DIR = path.resolve(RESOURCE_DIR, "src/public/images/app-icons/png");
if (!fs.existsSync(DB_INIT_DIR)) { if (!fs.existsSync(DB_INIT_DIR)) {
log.error("Could not find DB initialization directory: " + DB_INIT_DIR); log.error("Could not find DB initialization directory: " + DB_INIT_DIR);
@ -25,6 +24,5 @@ module.exports = {
RESOURCE_DIR, RESOURCE_DIR,
MIGRATIONS_DIR, MIGRATIONS_DIR,
DB_INIT_DIR, DB_INIT_DIR,
ELECTRON_APP_ROOT_DIR, ELECTRON_APP_ROOT_DIR
APP_PNG_ICON_DIR
}; };