diff --git a/lib/cmds/blockchain/blockchain.js b/lib/cmds/blockchain/blockchain.js index e83167bc..4b1a9bd4 100644 --- a/lib/cmds/blockchain/blockchain.js +++ b/lib/cmds/blockchain/blockchain.js @@ -37,7 +37,7 @@ var Blockchain = function(options) { Blockchain.prototype.runCommand = function(cmd) { console.log(("running: " + cmd.underline).green); - return shelljs.exec(cmd); + return shelljs.exec(cmd, {async:true}); }; Blockchain.prototype.run = function() { diff --git a/lib/index.js b/lib/index.js index 7037f224..5435e03a 100644 --- a/lib/index.js +++ b/lib/index.js @@ -48,7 +48,7 @@ var Embark = (function () { var engine = new Engine({ env: options.env, - embarkConfig: 'embark.json' + embarkConfig: options.embarkConfig || 'embark.json' }); engine.init(); diff --git a/lib/pipeline/watch.js b/lib/pipeline/watch.js index d1b1c8b7..3d137798 100644 --- a/lib/pipeline/watch.js +++ b/lib/pipeline/watch.js @@ -14,7 +14,7 @@ Watch.prototype.start = function() { var self = this; // TODO: should come from the config object instead of reading the file // directly - var embarkConfig = fs.readJSONSync("embark.json"); + var embarkConfig = fs.readJSONSync('./../../../../../server/embark.json'); this.watchAssets(embarkConfig, function() { self.logger.trace('ready to watch asset changes');