refactor: remove another async.series

src/cli/setup.js

@@ -1,13 +1,12 @@
 'use strict';
 
 const winston = require('winston');
-const async = require('async');
 const path = require('path');
 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 install = require('../install');
 	const build = require('../meta/build');
@@ -21,12 +20,7 @@ function setup(initConfig) {
 	console.log('Press enter to accept the default setting (shown in brackets).');
 
 	install.values = initConfig;
-
-	async.series([
-		async function () {
-			return await install.setup();
-		},
-		function (next) {
+	const data = await install.setup();
 	let configFile = paths.config;
 	if (nconf.get('config')) {
 		configFile = path.resolve(paths.baseDir, nconf.get('config'));
@@ -35,14 +29,8 @@ function setup(initConfig) {
 	prestart.loadConfig(configFile);
 
 	if (!nconf.get('skip-build')) {
-				build.buildAll(next);
-			} else {
-				setImmediate(next);
+		await build.buildAll();
 	}
-		},
-	], (err, data) => {
-		// Disregard build step data
-		data = data[0];
 
 	let separator = '     ';
 	if (process.stdout.columns > 10) {
@@ -52,10 +40,6 @@ function setup(initConfig) {
 	}
 	console.log(`\n${separator}\n`);
 
-		if (err) {
-			winston.error(`There was a problem completing NodeBB setup\n${err.stack}`);
-			throw err;
-		} else {
 	if (data.hasOwnProperty('password')) {
 		console.log('An administrative user was automatically created for you:');
 		console.log(`    Username: ${data.username}`);
@@ -69,11 +53,8 @@ function setup(initConfig) {
 	if (process.send) {
 		process.send(data);
 	}
-		}
-
 	process.exit();
-	});
 }
 
 exports.setup = setup;
-exports.webInstall = install;
+exports.webInstall = webInstall;