From d1329f60c3a09631e364d7d6ee504f1b7ada0d56 Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Wed, 31 Jan 2018 08:03:25 -0500
Subject: [PATCH] fix electron build

---
 bin/build.sh                   | 6 +++---
 src/electron.js => electron.js | 4 ++--
 package.json                   | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename src/electron.js => electron.js (96%)

diff --git a/bin/build.sh b/bin/build.sh
index b17b1773b..e62582618 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -7,15 +7,15 @@ rm -r dist/*
 echo "Rebuilding binaries for linux-ia32"
 ./node_modules/.bin/electron-rebuild --arch=ia32
 
-./node_modules/.bin/electron-packager src/electron --out=dist --platform=linux --arch=ia32 --overwrite
+./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=ia32 --overwrite
 
-./node_modules/.bin/electron-packager src/electron --out=dist --platform=win32 --arch=x64 --overwrite
+./node_modules/.bin/electron-packager . --out=dist --platform=win32 --arch=x64 --overwrite
 
 # we build x64 as second so that we keep X64 binaries in node_modules for local development
 echo "Rebuilding binaries for linux-x64"
 ./node_modules/.bin/electron-rebuild --arch=x64
 
-./node_modules/.bin/electron-packager src/electron --out=dist --platform=linux --arch=x64 --overwrite
+./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=x64 --overwrite
 
 echo "Copying required windows binaries"
 
diff --git a/src/electron.js b/electron.js
similarity index 96%
rename from src/electron.js
rename to electron.js
index 037f2f58c..f72f6a0ad 100644
--- a/src/electron.js
+++ b/electron.js
@@ -2,7 +2,7 @@
 
 const electron = require('electron');
 const path = require('path');
-const config = require('./services/config');
+const config = require('./src/services/config');
 const url = require("url");
 
 const app = electron.app;
@@ -69,4 +69,4 @@ app.on('ready', () => {
     mainWindow = createMainWindow();
 });
 
-require('./www');
+require('./src/www');
diff --git a/package.json b/package.json
index 226f0dfbf..2b6225667 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
   "description": "Trilium Notes",
   "version": "0.5.1-beta",
   "license": "AGPL-3.0-only",
+  "main": "electron.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/zadam/trilium.git"
@@ -12,7 +13,7 @@
     "test-electron": "xo",
     "rebuild-electron": "electron-rebuild",
     "start-electron": "electron src/electron",
-    "build-electron": "electron-packager src/electron --out=dist --asar --overwrite --all",
+    "build-electron": "electron-packager . --out=dist --asar --overwrite --all",
     "start-forge": "electron-forge start",
     "package-forge": "electron-forge package",
     "make-forge": "electron-forge make",