From 69ef7f0ec5ea5aefbd53861de75e46e1658c0869 Mon Sep 17 00:00:00 2001
From: Michael Barlow <m.barlow12@gmail.com>
Date: Tue, 2 Oct 2018 06:45:26 -0600
Subject: [PATCH] lint error fix

---
 js/configurePreferences.js | 5 ++---
 js/configureStartup.js     | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/js/configurePreferences.js b/js/configurePreferences.js
index beb47224..3975bf9f 100644
--- a/js/configurePreferences.js
+++ b/js/configurePreferences.js
@@ -53,14 +53,13 @@ module.exports = function() {
     assert( preferences.rosettaDevDbPass, `rosettaDevDbPass is missing from ${PREFERENCES_FILE}` );
 
     // 'pg' module uses env variables to establish the db connection
-    process.env = {
-      ...process.env,
+    process.env = Object.assign( process.env, {
       PGUSER: preferences.rosettaDevDbUser,
       PGHOST: preferences.rosettaDevDbHost,
       PGPASSWORD: preferences.rosettaDevDbPass,
       PGDATABASE: preferences.rosettaDevDbName,
       PGPORT: preferences.rosettaDevDbPort
-    }
+    } );
 
     // assert that the server is running and that there is a successful database connection
     const client = new Client();
diff --git a/js/configureStartup.js b/js/configureStartup.js
index 389574de..2fcfff65 100644
--- a/js/configureStartup.js
+++ b/js/configureStartup.js
@@ -55,11 +55,6 @@ module.exports = function() {
     }
   } );
 
-  if ( process.env.ENV === 'dev' ) {
-    debugger;
-    process.env = { ...process.env, ...global.preferences.devDbOptions };
-  }
-
   // Handle command line input
   // First 2 args provide info about executables, ignore
   const commandLineArgs = process.argv.slice( 2 );