From bc21d533bd2c1b9f4bdfb8553b4a3f21d1b845e1 Mon Sep 17 00:00:00 2001 From: Makazzz Date: Sat, 26 Oct 2019 15:24:16 -0400 Subject: Testing --- src/config.js | 3 +-- src/index.js | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/config.js b/src/config.js index ad4fc6165..761d26eea 100644 --- a/src/config.js +++ b/src/config.js @@ -113,8 +113,7 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [ export const LOCAL_SERVER = 'You are using Ferdi without a server'; -// export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); -export const SETTINGS_PATH = path.join(app.getPath('appData'), 'config'); +export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config'); // Replacing app.asar is not beautiful but unforunately necessary export const RECIPES_PATH = asarPath(path.join(__dirname, 'recipes')); diff --git a/src/index.js b/src/index.js index edcea2049..fd96f8a49 100644 --- a/src/index.js +++ b/src/index.js @@ -10,10 +10,10 @@ import path from 'path'; import windowStateKeeper from 'electron-window-state'; // Set app directory before loading user modules -if (process.env.FERDI_APPDATA_DIR != null) { - app.setPath('appData', process.env.FERDI_APPDATA_DIR); -} else if (process.env.PORTABLE_EXECUTABLE_DIR != null) { - app.setPath('appData', process.env.PORTABLE_EXECUTABLE_DIR, `${app.getName()}-appdata`); +if (process.env.FERDI_APPDATA_DIR || process.env.PORTABLE_EXECUTABLE_DIR) { + const appDataPath = process.env.FERDI_APPDATA_DIR || process.env.PORTABLE_EXECUTABLE_DIR + app.setPath('appData', appDataPath); + app.setPath('userData', path.join(app.getPath('appData'), app.getName())); } if (isDevMode) { -- cgit v1.2.3-70-g09d2