Fix MacOS native library not found (closes #16)

sleeyax · Sep 23, 2022 · 6f3166a · 6f3166a
1 parent 08fce6f
commit 6f3166a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/build.sh b/build.sh
@@ -19,11 +19,12 @@ copy() {
   # params
   local binary=$1
   local resourceFolder=$2
+  local prefix=$3
   local extension="${binary##*.}"
 
   # locations to copy to and from
   local binaryPath="./src-go/server/build/$binary"
-  local resourcePath="./src/main/resources/$resourceFolder/server.$extension"
+  local resourcePath="./src/main/resources/$resourceFolder/${prefix}server.$extension"
 
   # perform copy
   mkdir -p $(dirname "$resourcePath")
@@ -32,7 +33,7 @@ copy() {
 }
 
 copy_macos() {
-  copy "server-darwin-amd64.dylib" "darwin-x86-64"
+  copy "server-darwin-amd64.dylib" "darwin-x86-64" "lib"
 }
 
 copy_linux_386() {

diff --git a/src/main/java/burp/ServerLibrary.java b/src/main/java/burp/ServerLibrary.java
@@ -5,7 +5,7 @@
 import com.sun.jna.Platform;
 
 public interface ServerLibrary extends Library {
-    ServerLibrary INSTANCE = Native.load("server." + (Platform.isWindows() ? "dll" : Platform.isMac() ? "dylib" : "so"), ServerLibrary.class);
+    ServerLibrary INSTANCE = Native.load((Platform.isMac() ? "lib" : "") +  "server." + (Platform.isWindows() ? "dll" : Platform.isMac() ? "dylib" : "so"), ServerLibrary.class);
 
     String StartServer(String address);
     String StopServer();