Merge remote-tracking branch 'origin/master' into next57

This commit is contained in:
zadam 2022-10-16 21:25:03 +02:00
commit 7e83d3a54d

View File

@ -28,11 +28,17 @@ function installLocalAppIcon() {
return;
}
if (!fs.existsSync(path.resolve(ELECTRON_APP_ROOT_DIR, "trilium-portable.sh"))) {
// simple heuristic to detect ".tar.xz" linux build (i.e. not flatpak, not debian)
// only in such case it's necessary to create an icon
return;
}
const desktopDir = path.resolve(os.homedir(), '.local/share/applications');
fs.stat(desktopDir, function (err, stats) {
if (err) {
// Directory doesn't exist so we won't attempt to create the .desktop file
// Directory doesn't exist, so we won't attempt to create the .desktop file
return;
}
@ -64,4 +70,4 @@ function getExePath() {
module.exports = {
installLocalAppIcon
};
};