-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix: Run app.setAppPath() with the right path
- Loading branch information
1 parent
0d2b974
commit 331c768
Showing
2 changed files
with
38 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,24 @@ | ||
if (process.arch === 'arm64') { | ||
process._archPath = require.resolve('../app-arm64.asar'); | ||
setPaths('arm64'); | ||
} else { | ||
process._archPath = require.resolve('../app-x64.asar'); | ||
setPaths('x64'); | ||
} | ||
|
||
function setPaths(platform) { | ||
// This should return the full path, ending in something like | ||
// Notion.app/Contents/Resources/app.asar | ||
const appPath = app.getAppPath() | ||
const asarFile = `app-${platform}.asar` | ||
|
||
// Maybe we'll handle this in Electron one day | ||
if (appPath.includes('app.asar')) { | ||
const platformAppPath = appPath.replace(/\.app\.asar$/, asarFile) | ||
|
||
// This is an undocumented API. It exists. | ||
app.setAppPath(platformAppPath) | ||
} | ||
|
||
process._archPath = require.resolve(`../${asarFile}`); | ||
} | ||
|
||
require(process._archPath); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,24 @@ | ||
if (process.arch === 'arm64') { | ||
process._archPath = require.resolve('../app-arm64'); | ||
setPaths('arm64'); | ||
} else { | ||
process._archPath = require.resolve('../app-x64'); | ||
setPaths('x64'); | ||
} | ||
|
||
function setPaths(platform) { | ||
// This should return the full path, ending in something like | ||
// Notion.app/Contents/Resources/app | ||
const appPath = app.getAppPath() | ||
const appFolder = `app-${platform}` | ||
|
||
// Maybe we'll handle this in Electron one day | ||
if (appPath.endsWith('app')) { | ||
const platformAppPath = appPath.replace(/app$/, appFolder) | ||
|
||
// This is an undocumented API. It exists. | ||
app.setAppPath(platformAppPath) | ||
} | ||
|
||
process._archPath = require.resolve(`../${appFolder}`); | ||
} | ||
|
||
require(process._archPath); |