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

Extract helper function to load specified app

Browse source
This commit is contained in:
Kevin Sawicki 2016-02-04 10:07:19 -08:00
parent 8df3856c8f
commit 2e96cab6aa
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/default_app/main.js
View file

@ -234,12 +234,10 @@ if (option.modules.length > 0) {
require('module')._preloadModules(option.modules); require('module')._preloadModules(option.modules);
} }
// Start the specified app if there is one specified in command line, otherwise function loadPackagePath(packagePath) {
// start the default app.
if (option.file && !option.webdriver) {
try { try {
// Override app name and version. // Override app name and version.
var packagePath = path.resolve(option.file); packagePath = path.resolve(packagePath);
var packageJsonPath = path.join(packagePath, 'package.json'); var packageJsonPath = path.join(packagePath, 'package.json');
if (fs.existsSync(packageJsonPath)) { if (fs.existsSync(packageJsonPath)) {
var packageJson = JSON.parse(fs.readFileSync(packageJsonPath)); var packageJson = JSON.parse(fs.readFileSync(packageJsonPath));
@ -270,6 +268,12 @@ if (option.file && !option.webdriver) {
throw e; throw e;
} }
} }
}
// Start the specified app if there is one specified in command line, otherwise
// start the default app.
if (option.file && !option.webdriver) {
loadPackagePath(option.file);
} else if (option.version) { } else if (option.version) {
console.log('v' + process.versions.electron); console.log('v' + process.versions.electron);
process.exit(0); process.exit(0);