From d0fc2f7e714628f2821215f984d1adb9d2a31102 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Thu, 13 Apr 2017 10:48:46 -0700
Subject: [PATCH] Ensure that package.json environment > NODE_ENV

We only set the environment in package.json when it is packaged for
deployment. When we do that, we don't want to allow a local environment
variable to override it.

// FREEBIE
---
 main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.js b/main.js
index 1017e2371..6279a27b6 100644
--- a/main.js
+++ b/main.js
@@ -27,7 +27,7 @@ if (shouldQuit) {
 }
 
 const package_json = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf-8'))
-process.env.NODE_ENV = process.env.NODE_ENV || package_json.environment || 'development';
+process.env.NODE_ENV = package_json.environment || process.env.NODE_ENV || 'development';
 process.env.NODE_CONFIG_DIR = path.join(__dirname, 'config');
 const config = require('config');