Skip to content

Commit b5849a5

Browse files
committed
Revert d7c01b3 which should only be in 6.0
See #24173
1 parent 7dcabbb commit b5849a5

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,11 @@ void execute(Terminal terminal, String pluginId, boolean isBatch, Environment en
207207
throw new UserException(ExitCodes.USAGE, "plugin id is required");
208208
}
209209

210+
if (Files.exists(env.pluginsFile()) == false) {
211+
terminal.println("Plugins directory [" + env.pluginsFile() + "] does not exist. Creating...");
212+
Files.createDirectory(env.pluginsFile());
213+
}
214+
210215
Path pluginZip = download(terminal, pluginId, env.tmpFile());
211216
Path extractedZip = unzip(pluginZip, env.pluginsFile());
212217
install(terminal, isBatch, extractedZip, env);

distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,6 @@ public void testUnknownPlugin() throws Exception {
348348
assertTrue(e.getMessage(), e.getMessage().contains("Unknown plugin foo"));
349349
}
350350

351-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/24693")
352351
public void testPluginsDirMissing() throws Exception {
353352
Tuple<Path, Environment> env = createEnv(fs, temp);
354353
Files.delete(env.v2().pluginsFile());

0 commit comments

Comments
 (0)