From d6949815add0facfad971e0764bdc144c6c63390 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 23 Apr 2015 17:03:31 -0400
Subject: [PATCH] #3085

---
 src/install.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/install.js b/src/install.js
index f6e6c0c6f7..4a48d7197c 100644
--- a/src/install.js
+++ b/src/install.js
@@ -55,7 +55,9 @@ function checkSetupFlag(next) {
 	var	envSetupKeys = ['database'],
 		setupVal;
 	try {
-		setupVal = JSON.parse(nconf.get('setup'));
+		if (nconf.get('setup')) {
+			setupVal = JSON.parse(nconf.get('setup'));
+		}
 	} catch (err) {
 		winston.error('Was unable to parse JSON, continuing with regular setup.', err);
 		setupVal = undefined;
@@ -472,17 +474,17 @@ function setCopyrightWidget(next) {
 		if (err) {
 			return next(err);
 		}
-		
+
 		if (!results.footer && results.footerJSON) {
-			db.setObjectField('widgets:global', 'footer', results.footerJSON.toString(), next);	
+			db.setObjectField('widgets:global', 'footer', results.footerJSON.toString(), next);
 		} else {
 			next();
 		}
-	});	
+	});
 }
 
 install.setup = function (callback) {
-	var upgrade = require('./upgrade');
+
 
 	async.series([
 		checkSetupFlag,
@@ -497,6 +499,7 @@ install.setup = function (callback) {
 		enableDefaultPlugins,
 		setCopyrightWidget,
 		function (next) {
+			var upgrade = require('./upgrade');
 			upgrade.check(function(uptodate) {
 				if (!uptodate) { upgrade.upgrade(next); }
 				else { next(); }