Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-13 17:35:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

#3085

Browse Source
This commit is contained in:
barisusakli
2015-04-23 17:03:31 -04:00
parent a5c52958e7
commit d6949815ad
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/install.js
View File

@@ -55,7 +55,9 @@ function checkSetupFlag(next) {
var envSetupKeys = ['database'], var envSetupKeys = ['database'],
setupVal; setupVal;
try { try {
if (nconf.get('setup')) {
setupVal = JSON.parse(nconf.get('setup')); setupVal = JSON.parse(nconf.get('setup'));
}
} catch (err) { } catch (err) {
winston.error('Was unable to parse JSON, continuing with regular setup.', err); winston.error('Was unable to parse JSON, continuing with regular setup.', err);
setupVal = undefined; setupVal = undefined;
@@ -482,7 +484,7 @@ function setCopyrightWidget(next) {
} }
install.setup = function (callback) { install.setup = function (callback) {
var upgrade = require('./upgrade');
async.series([ async.series([
checkSetupFlag, checkSetupFlag,
@@ -497,6 +499,7 @@ install.setup = function (callback) {
enableDefaultPlugins, enableDefaultPlugins,
setCopyrightWidget, setCopyrightWidget,
function (next) { function (next) {
var upgrade = require('./upgrade');
upgrade.check(function(uptodate) { upgrade.check(function(uptodate) {
if (!uptodate) { upgrade.upgrade(next); } if (!uptodate) { upgrade.upgrade(next); }
else { next(); } else { next(); }