1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-14 18:27:44 +02:00

Merge branch 'master' of github.com:laurent22/joplin

This commit is contained in:
Laurent Cozic 2020-05-24 15:05:08 +01:00
commit d9ec2efa4b

View File

@ -582,9 +582,9 @@ class BaseApplication {
}
determineProfileDir(initArgs) {
if (initArgs.profileDir) return initArgs.profileDir;
if (initArgs.profileDir) return toSystemSlashes(initArgs.profileDir);
if (process && process.env && process.env.PORTABLE_EXECUTABLE_DIR) return `${process.env.PORTABLE_EXECUTABLE_DIR}/JoplinProfile`;
if (process && process.env && process.env.PORTABLE_EXECUTABLE_DIR) return toSystemSlashes(`${process.env.PORTABLE_EXECUTABLE_DIR}/JoplinProfile`);
return toSystemSlashes(`${os.homedir()}/.config/${Setting.value('appName')}`, 'linux');
}