hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linting

Browse Source
v1.18.x
psychobunny 11 years ago
parent 8f71a4ebfe
commit 98270bf500
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File

36
src/install.js
Unescape Escape View File

@ -105,10 +105,19 @@ var async = require('async'),
next(); next();
} else { } else {
winston.error('Required values are missing for automated setup:'); winston.error('Required values are missing for automated setup:');
if (!setupVal['admin:username']) winston.error(' admin:username'); if (!setupVal['admin:username']) {
if (!setupVal['admin:password']) winston.error(' admin:password'); winston.error(' admin:username');
if (!setupVal['admin:password:confirm']) winston.error(' admin:password:confirm'); }
if (!setupVal['admin:email']) winston.error(' admin:email'); 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(); process.exit();
} }
} else { } else {
@ -130,9 +139,16 @@ var async = require('async'),
next(); next();
} else { } else {
winston.error('Required values are missing for automated CI integration:'); winston.error('Required values are missing for automated CI integration:');
if (!ciVals.hasOwnProperty('host')) winston.error(' host'); if (!ciVals.hasOwnProperty('host')) {
if (!ciVals.hasOwnProperty('port')) winston.error(' port'); winston.error(' host');
if (!ciVals.hasOwnProperty('database')) winston.error(' database'); }
if (!ciVals.hasOwnProperty('port')) {
winston.error(' port');
}
if (!ciVals.hasOwnProperty('database')) {
winston.error(' database');
}
process.exit(); process.exit();
} }
} else { } else {
@ -192,10 +208,10 @@ var async = require('async'),
// Add CI object // Add CI object
if (install.ciVals) { if (install.ciVals) {
config['test_database'] = {}; config.test_database = {};
for(var prop in install.ciVals) { for(var prop in install.ciVals) {
if (install.ciVals.hasOwnProperty(prop)) { if (install.ciVals.hasOwnProperty(prop)) {
config['test_database'][prop] = install.ciVals[prop]; config.test_database[prop] = install.ciVals[prop];
} }
} }
} }
@ -241,7 +257,7 @@ var async = require('async'),
next(err, config); next(err, config);
} }
} }
], completeConfigSetup) ], completeConfigSetup);
}); });
} else { } else {
// Use provided values, fall back to defaults // Use provided values, fall back to defaults

Write Preview
Loading…
Cancel
Save