mirror of
https://github.com/CringeStudios/element-desktop.git
synced 2025-01-31 05:29:58 +01:00
Don't forget nightly when computing userData path
We were assuming we were always 'Element'
This commit is contained in:
parent
62736b86f1
commit
9d15c1bbd0
@ -115,14 +115,18 @@ if (userDataPathInProtocol) {
|
|||||||
} else if (argv['profile-dir']) {
|
} else if (argv['profile-dir']) {
|
||||||
userDataPath = argv['profile-dir'];
|
userDataPath = argv['profile-dir'];
|
||||||
} else {
|
} else {
|
||||||
|
// strip the bracketed riot suffix from the app name, if any: we don't want to
|
||||||
|
// store user data in a dir with that transitional suffix.
|
||||||
|
const appName = app.getName().replace(' (Riot)', '');
|
||||||
|
|
||||||
// always override the user data path because electron uses the ${appData}/productName
|
// always override the user data path because electron uses the ${appData}/productName
|
||||||
// but we want our productName to be "Element (Riot)" for a transition period after the rename.
|
// but we want our productName to be "Element (Riot)" for a transition period after the rename.
|
||||||
let newUserDataPath = path.join(app.getPath('appData'), 'Element');
|
let newUserDataPath = path.join(app.getPath('appData'), appName);
|
||||||
if (argv['profile']) {
|
if (argv['profile']) {
|
||||||
newUserDataPath += '-' + argv['profile'];
|
newUserDataPath += '-' + argv['profile'];
|
||||||
}
|
}
|
||||||
const newUserDataPathExists = isRealUserDataDir(newUserDataPath);
|
const newUserDataPathExists = isRealUserDataDir(newUserDataPath);
|
||||||
const oldUserDataPath = path.join(app.getPath('appData'), 'Riot');
|
const oldUserDataPath = path.join(app.getPath('appData'), appName.replace('Element', 'Riot'));
|
||||||
const oldUserDataPathExists = isRealUserDataDir(oldUserDataPath);
|
const oldUserDataPathExists = isRealUserDataDir(oldUserDataPath);
|
||||||
console.log(newUserDataPath + " exists: " + (newUserDataPathExists ? 'yes' : 'no'));
|
console.log(newUserDataPath + " exists: " + (newUserDataPathExists ? 'yes' : 'no'));
|
||||||
console.log(oldUserDataPath + " exists: " + (oldUserDataPathExists ? 'yes' : 'no'));
|
console.log(oldUserDataPath + " exists: " + (oldUserDataPathExists ? 'yes' : 'no'));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user