From d7e9f64d94ba4a7266bbeb7d4cdd6c8a3280648e Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 14 Jun 2024 14:34:57 +0200 Subject: [PATCH] Fix wrong variable names after testing Signed-off-by: 1000TurquoisePogs --- lib/initInstance.js | 5 +++-- lib/initUtils.js | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/initInstance.js b/lib/initInstance.js index 7be9cc2..38d6ffd 100644 --- a/lib/initInstance.js +++ b/lib/initInstance.js @@ -226,12 +226,13 @@ INSTALLED_COMPONENTS.forEach(function(installedComponent) { const fullPath = `${componentDirectory}/${path}` const pluginDefinition = `${fullPath}/pluginDefinition.json`; if (pluginDefinition && initUtils.fileExists(pluginDefinition)) { + const pluginDefinitionJson = JSON.parse(fs.readFileSync(pluginDefinition, 'utf8')); if (enabled) { initUtils.printFormattedInfo(`Registering plugin ${fullPath}`); - initUtils.registerPlugin(fullPath, pluginDefinition, config.pluginsDir, actionsPluginStorage, recognizersPluginStorage, RUNTIME_DIRECTORY); + initUtils.registerPlugin(fullPath, pluginDefinitionJson, config.pluginsDir, actionsPluginStorage, recognizersPluginStorage, RUNTIME_DIRECTORY); } else { initUtils.printFormattedDebug(`Deregistering plugin ${fullPath}`); - initUtils.deregisterPlugin(pluginDefinition, config.pluginsDir, actionsPluginStorage); + initUtils.deregisterPlugin(pluginDefinitionJson, config.pluginsDir, actionsPluginStorage); } } else { initUtils.printFormattedError(`Skipping plugin at ${fullPath} due to pluginDefinition missing or invalid`); diff --git a/lib/initUtils.js b/lib/initUtils.js index 4170e8c..7e5cecf 100644 --- a/lib/initUtils.js +++ b/lib/initUtils.js @@ -150,7 +150,7 @@ function registerApp2App(pluginDirectory, pluginId, pluginVersion, pluginActions } module.exports.registerApp2App = registerApp2App; -function copyRecognizers(appDir, appId, appVers, pluginRecognizersLocation) { +function copyRecognizers(appDir, appId, appVers, recognizerDirectory) { let recognizers; let recognizersKeys; let configRecognizers; @@ -202,7 +202,7 @@ function copyRecognizers(appDir, appId, appVers, pluginRecognizersLocation) { printFormattedDebug(`Done rec`); } -function copyActions(appDir, appId, appVers, pluginActionsLocation) { +function copyActions(appDir, appId, appVers, actionsDirectory) { let actions; let actionsKeys; const pluginActionsLocation = path.join(appDir, "config", "actions", appId);