From b9bc44f0afc0b67cf8fdfec18769e9e71d8ff5a2 Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Wed, 30 Oct 2019 09:32:20 -0400
Subject: [PATCH 1/2] Package the JDK into jdk.app on macOS

This commit packages the bundled JDK into jdk.app on macOS to assist
with notarization there.
---
 distribution/archives/build.gradle     | 10 ++++++++--
 distribution/src/bin/elasticsearch-env |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/distribution/archives/build.gradle b/distribution/archives/build.gradle
index 212419dbe6c22..fb1672d1a19a2 100644
--- a/distribution/archives/build.gradle
+++ b/distribution/archives/build.gradle
@@ -59,8 +59,14 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
         with binFiles(distributionType, oss, jdk)
       }
       if (jdk) {
-        into('jdk') {
-          with jdkFiles(project, platform)
+        if ("darwin".equals(platform)) {
+          into('jdk.app') {
+            with jdkFiles(project, platform)
+          }
+        } else {
+          into('jdk') {
+            with jdkFiles(project, platform)
+          }
         }
       }
       into('') {
diff --git a/distribution/src/bin/elasticsearch-env b/distribution/src/bin/elasticsearch-env
index e13eb824e77e9..62bce552e6442 100644
--- a/distribution/src/bin/elasticsearch-env
+++ b/distribution/src/bin/elasticsearch-env
@@ -42,7 +42,7 @@ if [ ! -z "$JAVA_HOME" ]; then
 else
   if [ "$(uname -s)" = "Darwin" ]; then
     # OSX has a different structure
-    JAVA="$ES_HOME/jdk/Contents/Home/bin/java"
+    JAVA="$ES_HOME/jdk.app/Contents/Home/bin/java"
   else
     JAVA="$ES_HOME/jdk/bin/java"
   fi

From b528401a8c8261b87ba07599ba416901ddf539b3 Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Wed, 30 Oct 2019 09:58:15 -0400
Subject: [PATCH 2/2] Fix OS name

---
 distribution/src/bin/elasticsearch-env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distribution/src/bin/elasticsearch-env b/distribution/src/bin/elasticsearch-env
index 62bce552e6442..867e19b3edd6b 100644
--- a/distribution/src/bin/elasticsearch-env
+++ b/distribution/src/bin/elasticsearch-env
@@ -41,7 +41,7 @@ if [ ! -z "$JAVA_HOME" ]; then
   JAVA_TYPE="JAVA_HOME"
 else
   if [ "$(uname -s)" = "Darwin" ]; then
-    # OSX has a different structure
+    # macOS has a different structure
     JAVA="$ES_HOME/jdk.app/Contents/Home/bin/java"
   else
     JAVA="$ES_HOME/jdk/bin/java"