From 9b5e0f9e95ca4d44c15ea388bea4abc715bac446 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 2 Jan 2018 14:45:21 -0500
Subject: [PATCH] updated upgrade logic to not break ACP restart flow

---
 src/cli/package-install.js | 2 +-
 src/cli/upgrade-plugins.js | 2 +-
 src/cli/upgrade.js         | 6 ++----
 src/meta/build.js          | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/cli/package-install.js b/src/cli/package-install.js
index 5f6f9917a5..e923094b05 100644
--- a/src/cli/package-install.js
+++ b/src/cli/package-install.js
@@ -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';
diff --git a/src/cli/upgrade-plugins.js b/src/cli/upgrade-plugins.js
index 3be00cb5d1..a61a711bf7 100644
--- a/src/cli/upgrade-plugins.js
+++ b/src/cli/upgrade-plugins.js
@@ -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();
 			}
 		});
 	});
diff --git a/src/cli/upgrade.js b/src/cli/upgrade.js
index e5ab2b6c0c..2462f1f168 100644
--- a/src/cli/upgrade.js
+++ b/src/cli/upgrade.js
@@ -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();
 			});
 		};
diff --git a/src/meta/build.js b/src/meta/build.js
index 2beb5f8af9..552c9aa55c 100644
--- a/src/meta/build.js
+++ b/src/meta/build.js
@@ -212,7 +212,7 @@ function build(targets, callback) {
 		}
 
 		winston.info('[build] Asset compilation successful. Completed in ' + totalTime + 'sec.');
-		callback(null, true);
+		callback();
 	});
 }