From cbb5acacb966d313312533fe83345648564da92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Loi=CC=88c=20Mahieu?= <mahieuloic@gmail.com>
Date: Thu, 2 Jan 2014 18:53:01 +0100
Subject: [PATCH] Add ability to specify env variables in JSON By not
 overwriting the env object in the JSON, it allow us to specify env variables
 directly in the JSON.

---
 lib/Common.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/Common.js b/lib/Common.js
index da354fe5..f92ca836 100644
--- a/lib/Common.js
+++ b/lib/Common.js
@@ -31,9 +31,8 @@ Common.resolveAppPaths = function(app, cwd, outputter) {
 
   cwd = cwd || process.cwd();
 
-  app.env = {
-    pm_cwd: cwd
-  };
+  app.env = app.env || {};
+  app.env.pm_cwd = cwd;
 
   if (!('exec_mode' in app)) app['exec_mode'] = 'cluster_mode';