Remove spurious path stuff

fundthmcalculus · fundthmcalculus · commit ff70bcd95c7f · 2021-11-23T14:40:15.000-05:00
diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml
@@ -37,12 +37,8 @@ jobs:
         with:
           workflow: "build-libs.yml"
           path: ./libs
-      - name: Update Windows Path
-        run: echo "${{ github.workspace }}/libs" | Out-File -FilePath $env:GITHUB_PATH -Append
-        shell: pwsh
       - name: Build with Gradle
         run: |
-          echo $env:GITHUB_PATH
           python ../devops/build_sdks.py
           gradle build
         shell: pwsh
diff --git a/.github/workflows/release-java.yml b/.github/workflows/release-java.yml
@@ -40,7 +40,6 @@ jobs:
           branch: main
       - name: Publish package
         run: |
-          echo "${{ github.workspace }}/libs" | Out-File -FilePath $env:GITHUB_PATH -Append
           python ../devops/build_sdks.py --package-version=${{ github.event.inputs.packageVersion }}
           gradle publish
         working-directory: java
diff --git a/java/src/main/java/OkapiNative.java b/java/src/main/java/OkapiNative.java
@@ -2,6 +2,8 @@
 import com.sun.jna.Native;
 import com.sun.jna.Platform;
 
+import java.io.File;
+import java.nio.file.Files;
 import java.nio.file.Paths;
 
 
@@ -65,10 +67,13 @@ public static String getLibraryPath() {
         if (overrideLibraryPath != null && overrideLibraryPath.strip().length() > 0)
             return Paths.get(overrideLibraryPath).toAbsolutePath().toString();
 
-        var okapi_lib_path = System.getenv("OKAPI_LIBRARY_PATH");
+        var okapi_lib_path = System.getenv("LD_LIBRARY_PATH");
         if (okapi_lib_path != null && okapi_lib_path.strip().length() > 0) {
-            // Get the library name
-            return Paths.get(okapi_lib_path, getLibraryName()).toAbsolutePath().toString();
+            for (var path: okapi_lib_path.split(File.pathSeparator)) {
+                var testPath = Paths.get(path, getLibraryName());
+                if (Files.exists(testPath))
+                    return testPath.toAbsolutePath().toString();
+            }
         }
         // System native path load
         return "okapi";
diff --git a/python/trinsicokapi/wrapper.py b/python/trinsicokapi/wrapper.py
@@ -45,9 +45,8 @@ def find_native_lib() -> str:
         return lib_path
     lib_name = "okapi"
     # Allow for manual override and then manually check, since LINUX Python doesn't always work. :(
-    found_lib_path = _check_path(os.getenv('OKAPI_LIBRARY_PATH', ''), lib_name) \
-                     or find_library(lib_path) \
-                     or _check_path(os.getenv('LD_LIBRARY_PATH', ''), lib_name)
+    found_lib_path = _check_path(os.getenv('LD_LIBRARY_PATH', ''), lib_name) \
+                     or find_library(lib_path)
     return found_lib_path
 
 
