Fixed extraction of site plugins downloaded from github, so that we s…

…kip the top-level folder and we place the files directly under the _site folder Closes elastic#3551
mute · Aug 27, 2013 · 3a275a9 · 3a275a9
1 parent 979fe3a
commit 3a275a9
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/org/elasticsearch/plugins/PluginManager.java b/src/main/java/org/elasticsearch/plugins/PluginManager.java
@@ -126,7 +126,7 @@ public void downloadAndExtract(String name, boolean verbose) throws IOException
                 if (elements.length > 2) {
                     version = elements[2];
                 }
-                filterZipName = userName + "-" + repoName;
+                filterZipName = repoName;
                 // the installation file should not include the userName, just the repoName
                 name = repoName;
                 if (name.startsWith("elasticsearch-")) {
@@ -225,13 +225,13 @@ public void downloadAndExtract(String name, boolean verbose) throws IOException
                 if (zipEntry.isDirectory()) {
                     continue;
                 }
-                String zipName = zipEntry.getName().replace('\\', '/');
+                String zipEntryName = zipEntry.getName().replace('\\', '/');
                 if (filterZipName != null) {
-                    if (zipName.startsWith(filterZipName)) {
-                        zipName = zipName.substring(zipName.indexOf('/'));
+                    if (zipEntryName.startsWith(filterZipName)) {
+                        zipEntryName = zipEntryName.substring(zipEntryName.indexOf('/'));
                     }
                 }
-                File target = new File(extractLocation, zipName);
+                File target = new File(extractLocation, zipEntryName);
                 FileSystemUtils.mkdirs(target.getParentFile());
                 Streams.copy(zipFile.getInputStream(zipEntry), new FileOutputStream(target));
             }