From 4146a04a9ec9d4226b98c5917789683672617b74 Mon Sep 17 00:00:00 2001
From: jed <inmysocks@fastmail.com>
Date: Tue, 14 Apr 2020 13:03:12 +0200
Subject: [PATCH] Fix makelibrary.js to use enviroment variable paths (#4559)

This makes makelibrary.js use environment variables to find paths for plugins, themes and languages instead of just using the paths hardcoded in boot.js
---
 core/modules/commands/makelibrary.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/core/modules/commands/makelibrary.js b/core/modules/commands/makelibrary.js
index ce7150f0c..ae5977844 100644
--- a/core/modules/commands/makelibrary.js
+++ b/core/modules/commands/makelibrary.js
@@ -51,9 +51,20 @@ Command.prototype.execute = function() {
 				}
 			}
 		};
-	collectPublisherPlugins(path.resolve($tw.boot.corePath,$tw.config.pluginsPath));
-	collectPublisherPlugins(path.resolve($tw.boot.corePath,$tw.config.themesPath));
-	collectPlugins(path.resolve($tw.boot.corePath,$tw.config.languagesPath));
+	var pluginsPaths = $tw.getLibraryItemSearchPaths($tw.config.pluginsPath,$tw.config.pluginsEnvVar);
+	for(var u=0; u<pluginsPaths.length; u++) {
+		collectPublisherPlugins(pluginsPaths[u]);
+	}
+
+	var themesPaths = $tw.getLibraryItemSearchPaths($tw.config.themesPath,$tw.config.themesEnvVar);
+	for(var u=0; u<themesPaths.length; u++) {
+		collectPublisherPlugins(themesPaths[u]);
+	}
+
+	var languagesPaths = $tw.getLibraryItemSearchPaths($tw.config.languagesPath,$tw.config.languagesEnvVar);
+	for(var u=0; u<languagesPaths.length; u++) {
+		collectPlugins(languagesPaths[u]);
+	}
 	// Save the upgrade library tiddler
 	var pluginFields = {
 		title: upgradeLibraryTitle,