From 484715e44087e8df1461ee65d97c98dd4b773c63 Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Tue, 22 Jan 2019 19:49:33 +0100
Subject: [PATCH] fix icon in desktop linux build, fixes #372

---
 bin/build-linux-x64.sh       | 2 ++
 src/services/app_icon.js     | 6 +++---
 src/services/resource_dir.js | 4 +---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/build-linux-x64.sh b/bin/build-linux-x64.sh
index faf16b9b6..e200fc496 100755
--- a/bin/build-linux-x64.sh
+++ b/bin/build-linux-x64.sh
@@ -11,6 +11,8 @@ cp -r bin/deps/linux-x64/sqlite/* node_modules/sqlite3/lib/binding/
 
 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
 rm -r $BUILD_DIR/swiftshader
 
diff --git a/src/services/app_icon.js b/src/services/app_icon.js
index 8b6c6e747..9c6c0f3be 100644
--- a/src/services/app_icon.js
+++ b/src/services/app_icon.js
@@ -1,7 +1,7 @@
 "use strict";
 
 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 os = require('os');
 const fs = require('fs');
@@ -11,7 +11,7 @@ const utils = require('./utils');
 const template = `[Desktop Entry]
 Type=Application
 Name=Trilium Notes
-Icon=#APP_PNG_ICON_DIR#/128x128.png
+Icon=#APP_ROOT_DIR#/icon.png
 Exec=#EXE_PATH#
 Categories=Office
 Terminal=false
@@ -50,7 +50,7 @@ function installLocalAppIcon() {
 
 function getDesktopFileContent() {
     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()));
 }
 
diff --git a/src/services/resource_dir.js b/src/services/resource_dir.js
index 2077e9f70..28009aba7 100644
--- a/src/services/resource_dir.js
+++ b/src/services/resource_dir.js
@@ -7,7 +7,6 @@ const RESOURCE_DIR = path.resolve(__dirname, "../..");
 // where "trilium" executable is
 const ELECTRON_APP_ROOT_DIR = path.resolve(RESOURCE_DIR, "../..");
 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)) {
     log.error("Could not find DB initialization directory: " + DB_INIT_DIR);
@@ -25,6 +24,5 @@ module.exports = {
     RESOURCE_DIR,
     MIGRATIONS_DIR,
     DB_INIT_DIR,
-    ELECTRON_APP_ROOT_DIR,
-    APP_PNG_ICON_DIR
+    ELECTRON_APP_ROOT_DIR
 };
\ No newline at end of file