From a4dec7e3ab8e39651f11bf72baa83938fc11cd1a 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: Thu, 22 Aug 2019 20:40:44 -0400
Subject: [PATCH] fix: #7860, allow running single upgrade scripts from plugins

---
 install/package.json |  2 +-
 src/upgrade.js       | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/install/package.json b/install/package.json
index 16594b75b7..be133f04bb 100644
--- a/install/package.json
+++ b/install/package.json
@@ -80,7 +80,7 @@
         "mubsub-nbb": "^1.5.1",
         "nconf": "^0.10.0",
         "nodebb-plugin-composer-default": "6.3.6",
-        "nodebb-plugin-dbsearch": "4.0.2",
+        "nodebb-plugin-dbsearch": "4.0.3",
         "nodebb-plugin-emoji": "^3.0.0",
         "nodebb-plugin-emoji-android": "2.0.0",
         "nodebb-plugin-markdown": "8.10.4",
diff --git a/src/upgrade.js b/src/upgrade.js
index 9ab3084067..128c9a9602 100644
--- a/src/upgrade.js
+++ b/src/upgrade.js
@@ -129,12 +129,14 @@ Upgrade.runParticular = function (names, callback) {
 	console.log('\nParsing upgrade scripts... ');
 
 	async.waterfall([
-		async.apply(file.walk, path.join(__dirname, './upgrades')),
+		function (next) {
+			file.walk(path.join(__dirname, './upgrades'), next);
+		},
 		function (files, next) {
-			var upgrades = files.filter(function (file) {
-				return names.includes(path.basename(file, '.js'));
-			});
-
+			Upgrade.appendPluginScripts(files, next);
+		},
+		function (files, next) {
+			const upgrades = files.filter(file => names.includes(path.basename(file, '.js')));
 			Upgrade.process(upgrades, 0, next);
 		},
 	], callback);