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

linting install.js

Browse Source
This commit is contained in:
psychobunny
2014-04-11 17:19:40 -04:00
parent 4877e4a9d1
commit 4d429aa6d6
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/install.js
View File

@@ -99,10 +99,18 @@ var async = require('async'),
next();
} else {
winston.error('Required values are missing for automated setup:');
if (!setupVal['admin:username']) winston.error(' admin:username');
if (!setupVal['admin:password']) winston.error(' admin:password');
if (!setupVal['admin:password:confirm']) winston.error(' admin:password:confirm');
if (!setupVal['admin:email']) winston.error(' admin:email');
if (!setupVal['admin:username']) {
winston.error(' admin:username');
}
if (!setupVal['admin:password']) {
winston.error(' admin:password');
}
if (!setupVal['admin:password:confirm']) {
winston.error(' admin:password:confirm');
}
if (!setupVal['admin:email']) {
winston.error(' admin:email');
}
process.exit();
}
} else {
@@ -124,9 +132,15 @@ var async = require('async'),
next();
} else {
winston.error('Required values are missing for automated CI integration:');
if (!ciVals.hasOwnProperty('host')) winston.error(' host');
if (!ciVals.hasOwnProperty('port')) winston.error(' port');
if (!ciVals.hasOwnProperty('database')) winston.error(' database');
if (!ciVals.hasOwnProperty('host')) {
winston.error(' host');
}
if (!ciVals.hasOwnProperty('port')) {
winston.error(' port');
}
if (!ciVals.hasOwnProperty('database')) {
winston.error(' database');
}
process.exit();
}
} else {
@@ -200,10 +214,10 @@ var async = require('async'),
// Add CI object
if (install.ciVals) {
config['test_database'] = {};
config.test_database = {};
for(var prop in install.ciVals) {
if (install.ciVals.hasOwnProperty(prop)) {
config['test_database'][prop] = install.ciVals[prop];
config.test_database[prop] = install.ciVals[prop];
}
}
}