From e520453551f6a8074abcb0d5cdd5106ef3220309 Mon Sep 17 00:00:00 2001
From: Andy Bristol <andy.bristol@elastic.co>
Date: Tue, 13 Feb 2018 11:30:56 -0800
Subject: [PATCH] Fix location of sql cli jar

The `elasticsearch` directory in the plugin folder structure was
removed, so make sure the CLI jar ends up in $ES_HOME/bin/x-pack as
intended

Follow up from elastic/x-pack-elasticsearch#28589

Original commit: elastic/x-pack-elasticsearch@6580b38fe0674af5e0a424040677c1ba549970a0
---
 plugin/sql/build.gradle | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugin/sql/build.gradle b/plugin/sql/build.gradle
index a8a967b82e0..4de9cb08190 100644
--- a/plugin/sql/build.gradle
+++ b/plugin/sql/build.gradle
@@ -35,12 +35,13 @@ dependencies {
     }
 }
 
-/* Bundle the sql-cli into the binary files. This is useful
- * because it is an executable jar that can be moved wherever
- * it is needed. */
+/* Bundle the sql-cli into the binary files. It should end up
+ * in $ES_HOME/bin/x-pack/. This is useful because it is an
+ * executable jar that can be moved wherever it is needed.
+ */
 bundlePlugin {
     from (configurations.bin) {
-        into 'elasticsearch/bin'
+        into 'bin'
     }
 }