From 55163527589ff13831f89a32e1d09d10dea255e0 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sat, 22 Apr 2017 13:43:58 -0400
Subject: [PATCH] closes #5612

---
 src/upgrade.js                                    | 13 ++++++-------
 src/upgrades/1.5.0/moderation_history_refactor.js |  1 +
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/upgrade.js b/src/upgrade.js
index c149dc4bbd..c395dc8884 100644
--- a/src/upgrade.js
+++ b/src/upgrade.js
@@ -5,6 +5,7 @@
 var async = require('async');
 var path = require('path');
 var semver = require('semver');
+var readline = require('readline');
 
 var db = require('./database');
 var file = require('../src/file');
@@ -131,7 +132,7 @@ Upgrade.process = function (files, skipCount, callback) {
 					date: date,
 				};
 
-				process.stdout.write('  → '.white + String('[' + [date.getUTCFullYear(), date.getUTCMonth() + 1, date.getUTCDate()].join('/') + '] ').gray + String(scriptExport.name).reset + '... ');
+				process.stdout.write('  → '.white + String('[' + [date.getUTCFullYear(), date.getUTCMonth() + 1, date.getUTCDate()].join('/') + '] ').gray + String(scriptExport.name).reset + '...\n ');
 
 				// For backwards compatibility, cross-reference with schemaDate (if found). If a script's date is older, skip it
 				if ((!results.schemaDate && !results.schemaLogCount) || (scriptExport.timestamp <= results.schemaDate && semver.lt(version, '1.5.0'))) {
@@ -150,8 +151,8 @@ Upgrade.process = function (files, skipCount, callback) {
 					}
 
 					if (progress.total > 0) {
-						process.stdout.clearLine();
-						process.stdout.cursorTo(0);
+						readline.clearLine(process.stdout, 0);
+						readline.cursorTo(process.stdout, 0);
 						process.stdout.write('  → '.white + String('[' + [date.getUTCFullYear(), date.getUTCMonth() + 1, date.getUTCDate()].join('/') + '] ').gray + String(scriptExport.name).reset + '... ');
 					}
 
@@ -180,11 +181,9 @@ Upgrade.incrementProgress = function () {
 		filled = Math.floor((this.current / this.total) * 15);
 		unfilled = 15 - filled;
 	}
-	process.stdout.clearLine();
-	process.stdout.cursorTo(0);
 
-	process.stdout.write('  → '.white + String('[' + [this.date.getUTCFullYear(), this.date.getUTCMonth() + 1, this.date.getUTCDate()].join('/') + '] ').gray + String(this.script.name).reset + '... ');
-	process.stdout.write('[' + (filled ? new Array(filled).join('#') : '') + new Array(unfilled).join(' ') + '] (' + this.current + '/' + (this.total || '??') + ') ' + percentage);
+	readline.cursorTo(process.stdout, 0);
+	process.stdout.write('    [' + (filled ? new Array(filled).join('#') : '') + new Array(unfilled).join(' ') + '] (' + this.current + '/' + (this.total || '??') + ') ' + percentage + ' ');
 };
 
 module.exports = Upgrade;
diff --git a/src/upgrades/1.5.0/moderation_history_refactor.js b/src/upgrades/1.5.0/moderation_history_refactor.js
index f98e1c62db..50bb10a7e8 100644
--- a/src/upgrades/1.5.0/moderation_history_refactor.js
+++ b/src/upgrades/1.5.0/moderation_history_refactor.js
@@ -17,6 +17,7 @@ module.exports = {
 			async.each(ids, function (uid, next) {
 				db.getObjectField('user:' + uid, 'moderationNote', function (err, moderationNote) {
 					if (err || !moderationNote) {
+						progress.incr();
 						return next(err);
 					}
 					var note = {