Skip to content

Commit

Permalink
properly handling settings file
Browse files Browse the repository at this point in the history
  • Loading branch information
arboleya committed Dec 10, 2015
1 parent ebfd8fb commit 947b90a
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions lib/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,14 @@ App.prototype.start_meteor = function(done){

_.extend(env, process.env);
_.extend(env, this.$.plugins.env());

this.meteor_process = spawn(command, [], {

var args;
if(process.env.ELECTRIFY_SETTINGS_FILE)
args = ['--settings', process.env.ELECTRIFY_SETTINGS_FILE];
else
args = [];

this.meteor_process = spawn(command, args, {
cwd: this.$.env.app.meteor,
env: env,
// ignore on windows and them pipe stdout and sterr bellow
Expand Down

0 comments on commit 947b90a

Please sign in to comment.