diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/environment.js | 6 | ||||
-rw-r--r-- | src/index.js | 15 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/environment.js b/src/environment.js index e1762129b..73b1c7ab2 100644 --- a/src/environment.js +++ b/src/environment.js | |||
@@ -1,10 +1,12 @@ | |||
1 | import isDev from 'electron-is-dev'; | ||
2 | |||
1 | import { LIVE_API, DEV_API, LOCAL_API } from './config'; | 3 | import { LIVE_API, DEV_API, LOCAL_API } from './config'; |
2 | 4 | ||
3 | export const isDevMode = Boolean(process.execPath.match(/[\\/]electron/)); | 5 | export const isDevMode = isDev; |
4 | export const useLiveAPI = process.env.LIVE_API; | 6 | export const useLiveAPI = process.env.LIVE_API; |
5 | export const useLocalAPI = process.env.LOCAL_API; | 7 | export const useLocalAPI = process.env.LOCAL_API; |
6 | 8 | ||
7 | let platform = process.platform; | 9 | let { platform } = process; |
8 | if (process.env.OS_PLATFORM) { | 10 | if (process.env.OS_PLATFORM) { |
9 | platform = process.env.OS_PLATFORM; | 11 | platform = process.env.OS_PLATFORM; |
10 | } | 12 | } |
diff --git a/src/index.js b/src/index.js index 8d3b04845..494fa97f1 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -4,24 +4,23 @@ import { | |||
4 | shell, | 4 | shell, |
5 | ipcMain, | 5 | ipcMain, |
6 | } from 'electron'; | 6 | } from 'electron'; |
7 | import isDevMode from 'electron-is-dev'; | ||
7 | import fs from 'fs-extra'; | 8 | import fs from 'fs-extra'; |
8 | import path from 'path'; | 9 | import path from 'path'; |
9 | import windowStateKeeper from 'electron-window-state'; | 10 | import windowStateKeeper from 'electron-window-state'; |
10 | 11 | ||
12 | // Set app directory before loading user modules | ||
13 | if (isDevMode) { | ||
14 | app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev')); | ||
15 | } | ||
16 | |||
17 | /* eslint-disable import/first */ | ||
11 | import { | 18 | import { |
12 | isDevMode, | ||
13 | isMac, | 19 | isMac, |
14 | isWindows, | 20 | isWindows, |
15 | isLinux, | 21 | isLinux, |
16 | } from './environment'; | 22 | } from './environment'; |
17 | |||
18 | import { mainIpcHandler as basicAuthHandler } from './features/basicAuth'; | 23 | import { mainIpcHandler as basicAuthHandler } from './features/basicAuth'; |
19 | |||
20 | // DEV MODE: Save user data into FranzDev | ||
21 | if (isDevMode) { | ||
22 | app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev')); | ||
23 | } | ||
24 | /* eslint-disable import/first */ | ||
25 | import ipcApi from './electron/ipc-api'; | 24 | import ipcApi from './electron/ipc-api'; |
26 | import Tray from './lib/Tray'; | 25 | import Tray from './lib/Tray'; |
27 | import Settings from './electron/Settings'; | 26 | import Settings from './electron/Settings'; |