NativeLibFinder simplifies os name

enso-org · Dec 20, 2024 · fc325f2 · fc325f2
1 parent 7edc3be
commit fc325f2
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/engine/runtime/src/main/java/org/enso/interpreter/runtime/NativeLibraryFinder.java b/engine/runtime/src/main/java/org/enso/interpreter/runtime/NativeLibraryFinder.java
@@ -26,11 +26,7 @@ private NativeLibraryFinder() {}
    */
   static String findNativeLibrary(String libName, Package<TruffleFile> pkg) {
     var arch = System.getProperty("os.arch").toLowerCase(Locale.ENGLISH);
-    if (arch.contains(" ")) {
-      // Strip version information from the architecture string.
-      arch = arch.substring(0, arch.indexOf(' '));
-    }
-    var osName = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
+    var osName = simpleOsName();
     var libNameWithSuffix = System.mapLibraryName(libName);
     var libDir = pkg.polyglotDir().resolve("lib");
     if (!libDir.exists()) {
@@ -54,4 +50,21 @@ static String findNativeLibrary(String libName, Package<TruffleFile> pkg) {
     }
     return null;
   }
+
+  private static String simpleOsName() {
+    var osName = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
+    if (osName.contains(" ")) {
+      // Strip version
+      osName = osName.substring(0, osName.indexOf(' '));
+    }
+    if (osName.contains("linux")) {
+      return "linux";
+    } else if (osName.contains("mac")) {
+      return "macos";
+    } else if (osName.contains("windows")) {
+      return "windows";
+    } else {
+      throw new IllegalStateException("Unsupported OS: " + osName);
+    }
+  }
 }