From a0150a743f2f55da40f07ae55b22fc55e8e743a9 Mon Sep 17 00:00:00 2001
From: Florent Vilmart <florentvilmart@me.com>
Date: Tue, 1 Mar 2016 22:33:58 -0500
Subject: [PATCH] Fix error preventing starting parse-server from CLI with a
 config file

---
 src/cli/parse-server.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cli/parse-server.js b/src/cli/parse-server.js
index 627964f9..c5945b6c 100755
--- a/src/cli/parse-server.js
+++ b/src/cli/parse-server.js
@@ -42,14 +42,6 @@ if (program.args.length > 0 ) {
   console.log(`Configuation loaded from ${jsonPath}`)
 } 
 
-if (!program.appId || !program.masterKey || !program.serverURL) {
-  program.outputHelp();
-  console.error("");
-  console.error(colors.red("ERROR: appId, masterKey and serverURL are required"));
-  console.error("");
-  process.exit(1);
-}
-
 options = Object.keys(definitions).reduce(function (options, key) {
   if (program[key]) {
     options[key] = program[key];
@@ -61,6 +53,14 @@ if (!options.serverURL) {
   options.serverURL = `http://localhost:${options.port}${options.mountPath}`;
 }
 
+if (!options.appId || !options.masterKey || !options.serverURL) {
+  program.outputHelp();
+  console.error("");
+  console.error(colors.red("ERROR: appId, masterKey and serverURL are required"));
+  console.error("");
+  process.exit(1);
+}
+
 const app = express();
 const api = new ParseServer(options);
 app.use(options.mountPath, api);