From 0dc3e64353a553bbb6f0eb5b1673532ac11ccaa5 Mon Sep 17 00:00:00 2001 From: Samuel Fernandes Date: Fri, 17 Jan 2025 17:20:22 +0000 Subject: [PATCH] fix: update files --- src/main/java/org/xerial/snappy/SnappyLoader.java | 15 +-------------- .../xerial/snappy/native/Linux-musl/x86_64/.keep | 0 .../snappy/native/Linux-musl/x86_64/README.md | 1 - 3 files changed, 1 insertion(+), 15 deletions(-) create mode 100644 src/main/resources/org/xerial/snappy/native/Linux-musl/x86_64/.keep delete mode 100644 src/main/resources/org/xerial/snappy/native/Linux-musl/x86_64/README.md diff --git a/src/main/java/org/xerial/snappy/SnappyLoader.java b/src/main/java/org/xerial/snappy/SnappyLoader.java index 25979db..f1d555c 100644 --- a/src/main/java/org/xerial/snappy/SnappyLoader.java +++ b/src/main/java/org/xerial/snappy/SnappyLoader.java @@ -327,20 +327,7 @@ public class SnappyLoader } // Load an OS-dependent native library inside a jar file - String osName = OSInfo.getOSName(); - // Check for musl by looking at the output of ldd --version - try { - Process p = Runtime.getRuntime().exec(new String[]{"ldd", "--version"}); - try (BufferedReader br = new BufferedReader(new InputStreamReader(p.getErrorStream()))) { - String line = br.readLine(); - if (line != null && line.toLowerCase().contains("musl")) { - osName = "Linux-musl"; - } - } - } catch (Exception e) { - // Ignore errors - default to normal Linux detection - } - snappyNativeLibraryPath = "/org/xerial/snappy/native/" + osName + "/" + OSInfo.getArchName(); + snappyNativeLibraryPath = "/org/xerial/snappy/native/" + OSInfo.getNativeLibFolderPathForCurrentOS(); boolean hasNativeLib = hasResource(snappyNativeLibraryPath + "/" + snappyNativeLibraryName); if (!hasNativeLib) { if (OSInfo.getOSName().equals("Mac")) { diff --git a/src/main/resources/org/xerial/snappy/native/Linux-musl/x86_64/.keep b/src/main/resources/org/xerial/snappy/native/Linux-musl/x86_64/.keep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/org/xerial/snappy/native/Linux-musl/x86_64/README.md b/src/main/resources/org/xerial/snappy/native/Linux-musl/x86_64/README.md deleted file mode 100644 index 61b40d6..0000000 --- a/src/main/resources/org/xerial/snappy/native/Linux-musl/x86_64/README.md +++ /dev/null @@ -1 +0,0 @@ -This directory contains native libraries for Linux-musl x86_64 platform \ No newline at end of file