Merge pull request #333 from braydonf/global
Only use local install if config file exists.
This commit is contained in:
commit
8e8573ce2e
|
@ -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);
|
||||
}
|
||||
|
||||
});
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue