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

upgrade and setup steps call build step now, re: #5211

Browse Source
This commit is contained in:
Julian Lam
2016-11-16 20:24:10 -05:00
parent 179a28d73a
commit 03cf5d8da5
1 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app.js
View File

@@ -85,7 +85,7 @@ if (nconf.get('setup') || nconf.get('install')) {
start();
}
function loadConfig() {
function loadConfig(callback) {
winston.verbose('* using configuration stored in: %s', configFile);
nconf.file({
@@ -112,6 +112,10 @@ function loadConfig() {
if (nconf.get('url')) {
nconf.set('url_parsed', url.parse(nconf.get('url')));
}
if (typeof callback === 'function') {
callback();
}
}
@@ -252,7 +256,14 @@ function setup() {
process.stdout.write('\nThis looks like a new installation, so you\'ll have to answer a few questions about your environment before we can proceed.\n');
process.stdout.write('Press enter to accept the default setting (shown in brackets).\n');
install.setup(function (err, data) {
async.series([
async.apply(install.setup),
async.apply(loadConfig),
async.apply(build, true)
], function(err, data) {
// Disregard build step data
data = data[0];
var separator = ' ';
if (process.stdout.columns > 10) {
for(var x = 0,cols = process.stdout.columns - 10; x < cols; x++) {
@@ -281,9 +292,9 @@ function setup() {
process.exit();
});
}
};
function build (targets) {
function build (targets, callback) {
var db = require('./src/database');
var meta = require('./src/meta');
var valid = ['js', 'css', 'tpl'];
@@ -336,7 +347,7 @@ function build (targets) {
break;
default:
winston.warn('[build] Unknown target: \'' + target + '\'');
winston.warn('[build] Unknown build target: \'' + target + '\'');
setImmediate(next);
break;
}
@@ -346,21 +357,34 @@ function build (targets) {
return process.exit(1);
}
winston.info('[build] Asset compilation successful. Exiting.');
process.exit(0);
winston.info('[build] Asset compilation successful.');
if (typeof callback === 'function') {
callback();
} else {
process.exit(0);
}
});
});
};
function upgrade () {
require('./src/database').init(function (err) {
var db = require('./src/database');
var meta = require('./src/meta');
var upgrade = require('./src/upgrade');
async.series([
async.apply(db.init),
async.apply(meta.configs.init),
async.apply(upgrade.upgrade),
async.apply(build, true)
], function(err) {
if (err) {
winston.error(err.stack);
process.exit();
process.exit(1);
} else {
process.exit(0);
}
require('./src/meta').configs.init(function () {
require('./src/upgrade').upgrade();
});
});
};