From 1ce595083a3c713af4373260a0faebc505a3b3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Mon, 17 May 2021 13:59:11 -0400
Subject: [PATCH] fix: ioredis upgrade fix, maybe

---
 src/cli/upgrade.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/cli/upgrade.js b/src/cli/upgrade.js
index 0e1e96b1da..1210c23ef2 100644
--- a/src/cli/upgrade.js
+++ b/src/cli/upgrade.js
@@ -4,9 +4,6 @@ const async = require('async');
 const nconf = require('nconf');
 
 const packageInstall = require('./package-install');
-const upgrade = require('../upgrade');
-const build = require('../meta/build');
-const db = require('../database');
 const { upgradePlugins } = require('./upgrade-plugins');
 
 const steps = {
@@ -31,7 +28,7 @@ const steps = {
 		message: 'Checking installed plugins for updates...',
 		handler: function (next) {
 			async.series([
-				db.init,
+				require('../database').init,
 				upgradePlugins,
 			], next);
 		},
@@ -40,15 +37,15 @@ const steps = {
 		message: 'Updating NodeBB data store schema...',
 		handler: function (next) {
 			async.series([
-				db.init,
+				require('../database').init,
 				require('../meta').configs.init,
-				upgrade.run,
+				require('../upgrade').run,
 			], next);
 		},
 	},
 	build: {
 		message: 'Rebuilding assets...',
-		handler: build.buildAll,
+		handler: require('../meta/build').buildAll,
 	},
 };
 
@@ -96,10 +93,10 @@ function runUpgrade(upgrades, options) {
 	}
 
 	async.series([
-		db.init,
+		require('../database').init,
 		require('../meta').configs.init,
 		async function () {
-			await upgrade.runParticular(upgrades);
+			await require('../upgrade').runParticular(upgrades);
 		},
 	], (err) => {
 		if (err) {