From 6ef8d61c7b4cca3a6a551c3cfd028ecbec277801 Mon Sep 17 00:00:00 2001
From: Ben Taylor <benty@amazon.com>
Date: Tue, 19 Jul 2022 15:08:13 -0700
Subject: [PATCH] Update macos packaging logic to avoid duplicate paths after
 installation

---
 installers/mac/pkg/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/installers/mac/pkg/build.gradle b/installers/mac/pkg/build.gradle
index 002bff6ee26..e049220b950 100644
--- a/installers/mac/pkg/build.gradle
+++ b/installers/mac/pkg/build.gradle
@@ -71,12 +71,12 @@ task setupDirectories {
     doLast {
         exec {
             workingDir buildRoot
-            commandLine "mkdir", "-p", "pkgroot/Library/Java/JavaVirtualMachines"
+            commandLine "mkdir", "-p", "pkgroot/"
         }
 
         exec {
             workingDir buildRoot
-            commandLine "cp", "-Rf", "amazon-corretto-${project.version.major}.jdk", "pkgroot/Library/Java/JavaVirtualMachines/"
+            commandLine "cp", "-Rf", "amazon-corretto-${project.version.major}.jdk", "pkgroot/"
         }
 
         exec {
@@ -102,7 +102,7 @@ task generateInstaller {
                 "--version", project.version.full,
                 "--ownership", "recommended",
                 "--scripts", "resources",
-                "--install-location", "/Library/Java/JavaVirtualMachines/amazon-corretto-${project.version.major}.jdk",
+                "--install-location", "/Library/Java/JavaVirtualMachines/",
                 "build/components/amazon-corretto-${project.version.major}.jdk.pkg"
         }