From 8d257666a18e6d1de7176cbcbbffa38ebe85b8d1 Mon Sep 17 00:00:00 2001 From: Nathan Brei Date: Wed, 14 Aug 2024 15:32:06 -0400 Subject: [PATCH] Take JANA_HOME off of the plugin loader search path --- src/libraries/JANA/Services/JPluginLoader.cc | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/libraries/JANA/Services/JPluginLoader.cc b/src/libraries/JANA/Services/JPluginLoader.cc index 13cc617dc..e9a5545b6 100644 --- a/src/libraries/JANA/Services/JPluginLoader.cc +++ b/src/libraries/JANA/Services/JPluginLoader.cc @@ -73,17 +73,7 @@ void JPluginLoader::resolve_plugin_paths() { while (getline(envvar_ss, path, ':')) add_plugin_path(path); } - // 3. Next we look in the plugin directories relative to $JANA_HOME - if (const char* jana_home = getenv("JANA_HOME")) { - add_plugin_path(std::string(jana_home) + "/lib/JANA/plugins"); // In case we did a system install and want to avoid conflicts. - } - - // 4. Finally we look in the JANA install directory. - // By checking here, the user no longer needs to set JANA_HOME in order to run built-in plugins - // such as janadot and JTest. The install directory is supposed to be the same as JANA_HOME, - // but we can't guarantee that because the user can set JANA_HOME to be anything they want. - // It would be nice if nothing in the JANA codebase itself relied on JANA_HOME, although we - // won't be removing it anytime soon because of build_scripts. + // 3. Finally we look in the JANA install directory. add_plugin_path(JVersion::GetInstallDir() + "/lib/JANA/plugins"); }