mirror of
https://github.com/laurent22/joplin.git
synced 2025-01-26 18:58:21 +02:00
Merge branch 'master' of github.com:laurent22/joplin
This commit is contained in:
commit
d9ec2efa4b
@ -582,9 +582,9 @@ class BaseApplication {
|
|||||||
}
|
}
|
||||||
|
|
||||||
determineProfileDir(initArgs) {
|
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');
|
return toSystemSlashes(`${os.homedir()}/.config/${Setting.value('appName')}`, 'linux');
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user