commit 4d85300e3ab8ead94af4763cb049a2c93779c229
author Jean-Louis Monteiro <jeanouii@gmail.com> Wed Mar 01 13:35:44 2023 +0100
committer GitHub <noreply@github.com> Wed Mar 01 13:35:44 2023 +0100
tree 63164e77e87a3962d9ee33c2d3aa67036504d901
parent c57429dd060a1b0ed4ff18267a599ce8bd0cc5bc
parent e79f6e1e15605b5693d78496bd0a18af6add52b3

Merge pull request #12 from adam-waldenberg/osx-build-fix

OSX Build Fix

arthur-impl/src/main/java/org/apache/geronimo/arthur/impl/nativeimage/installer/SdkmanGraalVMInstaller.java

diff --git a/arthur-impl/src/main/java/org/apache/geronimo/arthur/impl/nativeimage/installer/SdkmanGraalVMInstaller.java b/arthur-impl/src/main/java/org/apache/geronimo/arthur/impl/nativeimage/installer/SdkmanGraalVMInstaller.java
index 6ad4c59..cae00b3 100644
--- a/arthur-impl/src/main/java/org/apache/geronimo/arthur/impl/nativeimage/installer/SdkmanGraalVMInstaller.java
+++ b/arthur-impl/src/main/java/org/apache/geronimo/arthur/impl/nativeimage/installer/SdkmanGraalVMInstaller.java
@@ -72,7 +72,12 @@
         if (!Files.isDirectory(exploded)) {
             configuration.getExtractor().accept(archive, exploded);
         }
-        return home = exploded;
+        home = exploded;
+        // if macos
+        if (Files.isDirectory(home.resolve("Contents/Home"))) {
+            home = home.resolve("Contents/Home");
+        }
+        return home;
     }
 
     public Path installNativeImage() {

arthur-maven-plugin/src/main/java/org/apache/geronimo/arthur/maven/mojo/ArthurMojo.java

diff --git a/arthur-maven-plugin/src/main/java/org/apache/geronimo/arthur/maven/mojo/ArthurMojo.java b/arthur-maven-plugin/src/main/java/org/apache/geronimo/arthur/maven/mojo/ArthurMojo.java
index 444828d..2a284a6 100644
--- a/arthur-maven-plugin/src/main/java/org/apache/geronimo/arthur/maven/mojo/ArthurMojo.java
+++ b/arthur-maven-plugin/src/main/java/org/apache/geronimo/arthur/maven/mojo/ArthurMojo.java
@@ -173,9 +173,10 @@
     }
 
     private String buildCacheGav(final String graalPlatform) {
-        if (!graalPlatform.toLowerCase(ROOT).startsWith("linux")) { // cygwin
+        if (graalPlatform.toLowerCase(ROOT).contains("win")) {
             return graalCacheGav + ":zip:" + graalPlatform + ':' + graalVersion;
         }
+        // linux, macos and others
         return graalCacheGav + ":tar.gz:" + graalPlatform + ':' + graalVersion;
     }
 
@@ -194,8 +195,11 @@
         final String graalJavaVersion = versionIncludesJavaVersion ?
                 versionSegments[versionSegments.length - 1].substring(1) :
                 System.getProperty("java.version", "1.8").startsWith("8") ? "8" : "11";
-        final String githubPlatform = graalPlatform.contains("win") ?
-                "windows-amd64" : (graalPlatform.contains("linux") ? "linux-amd64" : "darwin-amd64");
+        final String githubPlatform = graalPlatform.toLowerCase(ROOT).contains("win")
+                                      ? "windows-amd64"
+                                      : (graalPlatform.toLowerCase(ROOT).contains("mac")
+                                                           ? "darwin-amd64"
+                                                           : "linux-amd64");
         return graalDownloadUrl
                 .replace("${graalSimpleVersion}", graalSimpleVersion)
                 .replace("${graalJavaVersion}", graalJavaVersion)
@@ -209,6 +213,6 @@
         return (System.getProperty("os.name", "linux") +
                 ofNullable(System.getProperty("sun.arch.data.model"))
                         .orElseGet(() -> System.getProperty("os.arch", "64").replace("amd", "")))
-                .toLowerCase(ROOT);
+                .toLowerCase(ROOT).replace(" ", "");
     }
 }