Matrix/element-desktop
Matrix/element-desktop
1
0
Fork 0
mirror of https://github.com/vector-im/element-desktop.git synced 2024-09-09 22:05:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #72 from steef435/master

Browse source 
widen search paths / fix vector-im/riot-web#13190 [to release]
This commit is contained in:
J. Ryan Stinnett 2020-04-17 13:53:17 +01:00 committed by GitHub
commit ae2345e4b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/electron-main.js
View file

@ -96,9 +96,9 @@ if (userDataPathInProtocol) {
app.setPath('userData', `${app.getPath('userData')}-${argv['profile']}`);
}
async function tryAsarPaths(rawPaths) {
// Make everything relative to the current file
const paths = rawPaths.map(p => path.join(__dirname, p));
async function tryPaths(name, root, rawPaths) {
// Make everything relative to root
const paths = rawPaths.map(p => path.join(root, p));
for (const p of paths) {
try {
@ -107,27 +107,35 @@ async function tryAsarPaths(rawPaths) {
} catch (e) {
}
}
console.log("Couldn't find webapp files in any of: ");
console.log(`Couldn't find ${name} files in any of: `);
for (const p of paths) {
console.log("\t"+path.resolve(p));
}
throw new Error("Failed to find webapp files");
throw new Error(`Failed to find ${name} files`);
}
// Find the webapp resources and set up things that require them
async function setupGlobals() {
// find the webapp asar.
asarPath = await tryAsarPaths([
asarPath = await tryPaths("webapp", __dirname, [
// If run from the source checkout, this will be in the directory above
'../webapp.asar',
// but if run from a packaged application, electron-main.js will be in
// a different asar file so it will be two levels above
'../../webapp.asar',
// also try without the 'asar' suffix to allow symlinking in a directory
// also try without the 'asar' suffix to allow symlinking in a directory
'../webapp',
// from a packaged application
'../../webapp',
]);
// we assume the resources path is in the same place as the asar
resPath = path.join(path.dirname(asarPath), 'res');
resPath = await tryPaths("res", path.dirname(asarPath), [
// If run from the source checkout
'res',
// if run from packaged application
'',
]);
try {
vectorConfig = require(asarPath + 'config.json');