From fadd6617386c4b3122d17cda22aeebd6a9162646 Mon Sep 17 00:00:00 2001
From: Areek Zillur <areek.zillur@elasticsearch.com>
Date: Mon, 7 Nov 2016 15:21:01 -0500
Subject: [PATCH] Ensure license-tools zip extracts to a parent directory

Currently, extracting the license-tools zip does not create
a parent directory. This commit extracts out the `bin` and `lib`
folders inside a parent directory `license-tools-{version}`

Original commit: elastic/x-pack-elasticsearch@74960b6b1eff5816e335222d0fa1c90c2acb0d9c
---
 license-tools/build.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/license-tools/build.gradle b/license-tools/build.gradle
index 6b03bce666e..13db2144c5e 100644
--- a/license-tools/build.gradle
+++ b/license-tools/build.gradle
@@ -13,11 +13,12 @@ project.forbiddenPatterns {
 dependencyLicenses.enabled = false
 
 task buildZip(type: Zip, dependsOn: jar) {
-  into('lib') {
+  String parentDir = "license-tools-${version}"
+  into(parentDir + '/lib') {
     from jar
     from configurations.runtime
   } 
-  into('bin') {
+  into(parentDir + '/bin') {
     from 'bin'
   }
 }