updated upgrade logic to not break ACP restart flow

v1.18.x
Julian Lam 8 years ago
parent a524f9b55f
commit 9b5e0f9e95

@ -30,7 +30,7 @@ function updatePackageFile() {
exports.updatePackageFile = updatePackageFile;
function installAll() {
process.stdout.write('\n');
process.stdout.write(' started\n'.green);
var prod = global.env !== 'development';
var command = 'npm install';

@ -212,7 +212,7 @@ function upgradePlugins(callback) {
});
} else {
console.log('Package upgrades skipped'.yellow + '. Check for upgrades at any time by running "'.reset + './nodebb upgrade -p'.green + '".'.reset);
callback(null, true);
callback();
}
});
});

@ -16,6 +16,7 @@ var steps = {
handler: function (next) {
packageInstall.updatePackageFile();
packageInstall.preserveExtraneousPlugins();
process.stdout.write(' OK\n'.green);
next();
},
},
@ -54,11 +55,8 @@ function runSteps(tasks) {
tasks = tasks.map(function (key, i) {
return function (next) {
process.stdout.write('\n' + ((i + 1) + '. ').bold + steps[key].message.yellow);
return steps[key].handler(function (err, inhibitOk) {
return steps[key].handler(function (err) {
if (err) { return next(err); }
if (!inhibitOk) {
process.stdout.write(' OK'.green + '\n'.reset);
}
next();
});
};

@ -212,7 +212,7 @@ function build(targets, callback) {
}
winston.info('[build] Asset compilation successful. Completed in ' + totalTime + 'sec.');
callback(null, true);
callback();
});
}

Loading…
Cancel
Save