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

refactor: remove another async.series

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-11-16 17:11:26 -05:00
parent 4359e5c97c
commit 27c05448e1
1 changed files with 31 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/cli/setup.js
View File

@@ -1,13 +1,12 @@
'use strict'; 'use strict';
const winston = require('winston'); const winston = require('winston');
const async = require('async');
const path = require('path'); const path = require('path');
const nconf = require('nconf'); const nconf = require('nconf');
const { install } = require('../../install/web'); const { webInstall } = require('../../install/web');
function setup(initConfig) { async function setup(initConfig) {
const { paths } = require('../constants'); const { paths } = require('../constants');
const install = require('../install'); const install = require('../install');
const build = require('../meta/build'); const build = require('../meta/build');
@@ -21,59 +20,41 @@ function setup(initConfig) {
console.log('Press enter to accept the default setting (shown in brackets).'); console.log('Press enter to accept the default setting (shown in brackets).');
install.values = initConfig; install.values = initConfig;
const data = await install.setup();
let configFile = paths.config;
if (nconf.get('config')) {
configFile = path.resolve(paths.baseDir, nconf.get('config'));
}
async.series([ prestart.loadConfig(configFile);
async function () {
return await install.setup();
},
function (next) {
let configFile = paths.config;
if (nconf.get('config')) {
configFile = path.resolve(paths.baseDir, nconf.get('config'));
}
prestart.loadConfig(configFile); if (!nconf.get('skip-build')) {
await build.buildAll();
}
if (!nconf.get('skip-build')) { let separator = ' ';
build.buildAll(next); if (process.stdout.columns > 10) {
} else { for (let x = 0, cols = process.stdout.columns - 10; x < cols; x += 1) {
setImmediate(next); separator += '=';
}
},
], (err, data) => {
// Disregard build step data
data = data[0];
let separator = ' ';
if (process.stdout.columns > 10) {
for (let x = 0, cols = process.stdout.columns - 10; x < cols; x += 1) {
separator += '=';
}
} }
console.log(`\n${separator}\n`); }
console.log(`\n${separator}\n`);
if (err) { if (data.hasOwnProperty('password')) {
winston.error(`There was a problem completing NodeBB setup\n${err.stack}`); console.log('An administrative user was automatically created for you:');
throw err; console.log(` Username: ${data.username}`);
} else { console.log(` Password: ${data.password}`);
if (data.hasOwnProperty('password')) { console.log('');
console.log('An administrative user was automatically created for you:'); }
console.log(` Username: ${data.username}`); console.log('NodeBB Setup Completed. Run "./nodebb start" to manually start your NodeBB server.');
console.log(` Password: ${data.password}`);
console.log('');
}
console.log('NodeBB Setup Completed. Run "./nodebb start" to manually start your NodeBB server.');
// If I am a child process, notify the parent of the returned data before exiting (useful for notifying // If I am a child process, notify the parent of the returned data before exiting (useful for notifying
// hosts of auto-generated username/password during headless setups) // hosts of auto-generated username/password during headless setups)
if (process.send) { if (process.send) {
process.send(data); process.send(data);
} }
} process.exit();
process.exit();
});
} }
exports.setup = setup; exports.setup = setup;
exports.webInstall = install; exports.webInstall = webInstall;