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

linting

Browse Source
This commit is contained in:
psychobunny
2014-04-14 12:54:11 -04:00
parent 8f71a4ebfe
commit 98270bf500
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/install.js
View File

@@ -105,10 +105,19 @@ 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 {
@@ -130,9 +139,16 @@ 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 {
@@ -192,10 +208,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];
}
}
}
@@ -241,7 +257,7 @@ var async = require('async'),
next(err, config);
}
}
], completeConfigSetup)
], completeConfigSetup);
});
} else {
// Use provided values, fall back to defaults