honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Plugins: Update official plugin locaion with unified release 

This change updates the url pattern for official plugins to be inline
with what the unified release will produce.
This commit is contained in:
Ryan Ernst 2016-08-15 13:24:11 -07:00
parent 5ba06b6487
commit fe5e99a408
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java
View File

@ -143,8 +143,8 @@ class InstallPluginCommand extends SettingCommand {
private final OptionSpec<String> arguments; private final OptionSpec<String> arguments;
public static final Set<PosixFilePermission> DIR_AND_EXECUTABLE_PERMS; static final Set<PosixFilePermission> DIR_AND_EXECUTABLE_PERMS;
public static final Set<PosixFilePermission> FILE_PERMS; static final Set<PosixFilePermission> FILE_PERMS;
static { static {
Set<PosixFilePermission> dirAndExecutablePerms = new HashSet<>(7); Set<PosixFilePermission> dirAndExecutablePerms = new HashSet<>(7);
@ -211,18 +211,13 @@ class InstallPluginCommand extends SettingCommand {
final String url; final String url;
final String stagingHash = System.getProperty(PROPERTY_STAGING_ID); final String stagingHash = System.getProperty(PROPERTY_STAGING_ID);
if (stagingHash != null) { if (stagingHash != null) {
url = String.format( url = String.format(Locale.ROOT,
Locale.ROOT, "https://staging.elastic.co/%1$s/download/elasticsearch-plugins/%2$s/%2$s-%3$s.zip",
"https://download.elastic.co/elasticsearch/staging/%1$s-%2$s/org/elasticsearch/plugin/%3$s/%1$s/%3$s-%1$s.zip", stagingHash, pluginId, version);
version,
stagingHash,
pluginId);
} else { } else {
url = String.format( url = String.format(Locale.ROOT,
Locale.ROOT, "https://artifacts.elastic.co/download/elasticsearch-plugins/%1$s/%1$s-%2$s.zip",
"https://download.elastic.co/elasticsearch/release/org/elasticsearch/plugin/%1$s/%2$s/%1$s-%2$s.zip", pluginId, version);
pluginId,
version);
} }
terminal.println("-> Downloading " + pluginId + " from elastic"); terminal.println("-> Downloading " + pluginId + " from elastic");
return downloadZipAndChecksum(terminal, url, tmpDir); return downloadZipAndChecksum(terminal, url, tmpDir);