github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-08 23:18:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: app.getAppPath() returning default-app path for files or directories without package.json (#18763)

Browse Source
This commit is contained in:
Milan Burda
2019-06-19 23:34:22 +02:00
committed by Alexey Kuzmin
parent 7201845894
commit 79f0c444fd
4 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
default_app/main.ts
View File

@@ -85,6 +85,7 @@ function loadApplicationPackage (packagePath: string) {
// Override app name and version.
packagePath = path.resolve(packagePath)
const packageJsonPath = path.join(packagePath, 'package.json')
let appPath
if (fs.existsSync(packageJsonPath)) {
let packageJson
try {
@@ -102,11 +103,12 @@ function loadApplicationPackage (packagePath: string) {
} else if (packageJson.name) {
app.name = packageJson.name
}
app._setDefaultAppPaths(packagePath)
appPath = packagePath
}
try {
Module._resolveFilename(packagePath, module, true)
const filePath = Module._resolveFilename(packagePath, module, true)
app._setDefaultAppPaths(appPath || path.dirname(filePath))
} catch (e) {
showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${e.message}`)
return