From ceda1892605add076e3c5b8c39a7020109af7662 Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Tue, 24 May 2022 03:57:33 -0400 Subject: [PATCH] #1179 Resolves issue with JMBE Creator running on OSX. (#1262) Co-authored-by: Dennis Sheirer --- .../io/github/dsheirer/jmbe/JmbeCreator.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/github/dsheirer/jmbe/JmbeCreator.java b/src/main/java/io/github/dsheirer/jmbe/JmbeCreator.java index eccfe6a1..5ee7574b 100644 --- a/src/main/java/io/github/dsheirer/jmbe/JmbeCreator.java +++ b/src/main/java/io/github/dsheirer/jmbe/JmbeCreator.java @@ -25,6 +25,12 @@ import io.github.dsheirer.jmbe.github.Release; import io.github.dsheirer.util.FileUtil; import io.github.dsheirer.util.OSType; import io.github.dsheirer.util.ThreadPool; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import javafx.application.Platform; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; @@ -37,13 +43,6 @@ import org.rauschig.jarchivelib.ArchiverFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - /** * Creates the JMBE library by downloading the JMBE Creator CLI application from GitHub and executing it. */ @@ -147,7 +146,7 @@ public class JmbeCreator OSType osType = OSType.getCurrentOSType(); - if(osType.isLinux()) + if(osType.isLinux() || osType.isOsx()) { script = FileUtil.findFile(unzipped, CREATOR_SCRIPT_LINUX); } @@ -156,6 +155,7 @@ public class JmbeCreator script = FileUtil.findFile(unzipped, CREATOR_SCRIPT_WINDOWS); } + if(script != null) { ProcessBuilder processBuilder = new ProcessBuilder();