Misc fixes and improvements (#6143)

* `setup` command fixes and improvements

- Enable using the `./nodebb setup` command for auto-setup with a JSON argument
- Change CLI so package-install and dependency install are separate steps
- Fix #6142

* Prevent compiling templates multiple times

- Multiple requests for same template get pooled
- Hopefully fixes the "templateFunction is not a function" error which happens if site is restarted during high-traffic times

* More helpful upgrade template

src/cli/index.js

@@ -9,14 +9,30 @@ var dirname = require('./paths').baseDir;
 // check to make sure dependencies are installed
 try {
 	fs.readFileSync(path.join(dirname, 'package.json'));
-	fs.readFileSync(path.join(dirname, 'node_modules/async/package.json'));
+} catch (e) {
+	if (e.code === 'ENOENT') {
+		console.warn('package.json not found.');
+		console.log('Populating package.json...\n');
+
+		packageInstall.updatePackageFile();
+		packageInstall.preserveExtraneousPlugins();
+
+		console.log('OK'.green + '\n'.reset);
+	} else {
+		throw e;
+	}
+}
+
+try {
+	fs.readFileSync(path.join(dirname, 'node_modules/async/package.json'), 'utf8');
+	fs.readFileSync(path.join(dirname, 'node_modules/commander/package.json'), 'utf8');
+	fs.readFileSync(path.join(dirname, 'node_modules/colors/package.json'), 'utf8');
+	fs.readFileSync(path.join(dirname, 'node_modules/nconf/package.json'), 'utf8');
 } catch (e) {
 	if (e.code === 'ENOENT') {
 		console.warn('Dependencies not yet installed.');
 		console.log('Installing them now...\n');
 
-		packageInstall.updatePackageFile();
-		packageInstall.preserveExtraneousPlugins();
 		packageInstall.npmInstallProduction();
 
 		require('colors');
@@ -121,10 +137,20 @@ program
 
 // management commands
 program
-	.command('setup')
-	.description('Run the NodeBB setup script')
-	.action(function () {
-		require('./setup').setup();
+	.command('setup [config]')
+	.description('Run the NodeBB setup script, or setup with an initial config')
+	.action(function (initConfig) {
+		if (initConfig) {
+			try {
+				initConfig = JSON.parse(initConfig);
+			} catch (e) {
+				console.warn('Invalid JSON passed as initial config value.'.red);
+				console.log('If you meant to pass in an initial config value, please try again.\n');
+
+				throw e;
+			}
+		}
+		require('./setup').setup(initConfig);
 	});
 
 program

src/cli/paths.js

@@ -6,10 +6,12 @@ var baseDir = path.join(__dirname, '../../');
 var loader = path.join(baseDir, 'loader.js');
 var app = path.join(baseDir, 'app.js');
 var pidfile = path.join(baseDir, 'pidfile');
+var config = path.join(baseDir, 'config.json');
 
 module.exports = {
 	baseDir: baseDir,
 	loader: loader,
 	app: app,
 	pidfile: pidfile,
+	config: config,
 };

src/cli/setup.js

@@ -2,10 +2,13 @@
 
 var winston = require('winston');
 var async = require('async');
+var path = require('path');
+var nconf = require('nconf');
 
 var install = require('../../install/web').install;
 
-function setup() {
+function setup(initConfig) {
+	var paths = require('./paths');
 	var install = require('../install');
 	var build = require('../meta/build');
 	var prestart = require('../prestart');
@@ -17,9 +20,19 @@ function setup() {
 	console.log('\nThis looks like a new installation, so you\'ll have to answer a few questions about your environment before we can proceed.');
 	console.log('Press enter to accept the default setting (shown in brackets).');
 
+	install.values = initConfig;
+
 	async.series([
 		install.setup,
-		prestart.loadConfig,
+		function (next) {
+			var configFile = paths.config;
+			if (nconf.get('config')) {
+				configFile = path.resolve(paths.baseDir, nconf.get('config'));
+			}
+
+			prestart.loadConfig(configFile);
+			next();
+		},
 		build.buildAll,
 	], function (err, data) {
 		// Disregard build step data