mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Removes main error, fixes messaging for JSON parse

Browse source
This commit is contained in:
Matt Karl 2016-05-23 16:47:55 -04:00
parent 58d9d2cf41
commit ee61a2880a
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
default_app/main.js
View file

@ -238,7 +238,7 @@ function loadApplicationPackage (packagePath) {
try { try {
packageJson = JSON.parse(fs.readFileSync(packageJsonPath)) packageJson = JSON.parse(fs.readFileSync(packageJsonPath))
} catch (e) { } catch (e) {
showErrorMessage('Unable to parse package.json, it contains errors.\n\n' + showErrorMessage('Unable to parse package.json.\n\n' +
`${e.toString()} in ${packageJsonPath}`) `${e.toString()} in ${packageJsonPath}`)
} }
if (packageJson.version) app.setVersion(packageJson.version) if (packageJson.version) app.setVersion(packageJson.version)
@ -248,10 +248,6 @@ function loadApplicationPackage (packagePath) {
} else if (packageJson.name) { } else if (packageJson.name) {
app.setName(packageJson.name) app.setName(packageJson.name)
} }
if (!packageJson.main) {
showErrorMessage('App is missing \'main\' property in package.json.\n\n' +
`See: ${packageJsonPath}`)
}
app.setPath('userData', path.join(app.getPath('appData'), app.getName())) app.setPath('userData', path.join(app.getPath('appData'), app.getName()))
app.setPath('userCache', path.join(app.getPath('cache'), app.getName())) app.setPath('userCache', path.join(app.getPath('cache'), app.getName()))
app.setAppPath(packagePath) app.setAppPath(packagePath)