Merge pull request #333 from braydonf/global

Only use local install if config file exists.
This commit is contained in:
Patrick Nagurny 2015-10-20 14:58:36 -04:00
commit 8e8573ce2e
2 changed files with 8 additions and 8 deletions

View File

@ -23,12 +23,12 @@ function main(parentServicesPath, additionalServices) {
}, function(env){
var node;
if (typeof env.modulePath === 'undefined') {
node = require('../../');
node.cli.main(parentServicesPath, additionalServices);
} else {
if (env.configPath && env.modulePath) {
node = require(env.modulePath);
node.cli.main();
} else {
node = require('../../');
node.cli.main(parentServicesPath, additionalServices);
}
});

View File

@ -24,12 +24,12 @@ function main(parentServicesPath, additionalServices) {
var node;
if (typeof env.modulePath === 'undefined') {
node = require('../../');
node.cli.daemon(parentServicesPath, additionalServices);
} else {
if (env.configPath && env.modulePath) {
node = require(env.modulePath);
node.cli.daemon();
} else {
node = require('../../');
node.cli.daemon(parentServicesPath, additionalServices);
}
});