use native pjass on linux

Author: peq

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/Pjass.java

@@ -95,17 +95,26 @@ public static Result runPjass(File outputFile) {
             args.add(Utils.getResourceFile("common.j"));
             args.add(Utils.getResourceFile("blizzard.j"));
             args.add(outputFile.getPath());
-            if (!System.getProperty("os.name").toLowerCase().contains("windows")) {
-                WLogger.info("Operation system " + System.getProperty("os.name") + " detected.");
+            String os = System.getProperty("os.name");
+            if (os.equals("Linux")) {
+                File fileName = Utils.getResourceFileF("pjass");
+                boolean success = fileName.setExecutable(true);
+                if (!success) {
+                    throw new RuntimeException("Could not make pjass executable.");
+                }
+                args.set(0, fileName.getAbsolutePath());
+            } else if (!os.toLowerCase().contains("windows")) {
+                WLogger.info("Operation system " + os + " detected.");
                 WLogger.info("Trying to run with wine ...");
                 // try to run with wine
                 args.add(0, "wine");
             }
+
             p = Runtime.getRuntime().exec(args.toArray(new String[0]));
 
             StringBuilder output = new StringBuilder();
 
-            try(BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream()))) {
+            try (BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream()))) {
                 String line;
                 while ((line = input.readLine()) != null) {
                     WLogger.info(line);
@@ -114,7 +123,6 @@ public static Result runPjass(File outputFile) {
             }
 
 
-
             int exitValue = p.waitFor();
             if (exitValue != 0) {
                 return new Result(outputFile, false, "pjass errors: \n" + output.toString());

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/utils/Utils.java

@@ -17,6 +17,7 @@
 import de.peeeq.wurstscript.types.WurstType;
 import de.peeeq.wurstscript.types.WurstTypeUnknown;
 import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
 
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -931,12 +932,19 @@ public static String string(String... lines) {
      * Extracts a resource from the jar, stores it in a temp file and returns the abolute path to the tempfile
      */
     public static synchronized String getResourceFile(String name) {
+        return getResourceFileF(name).getAbsolutePath();
+    }
+
+    /**
+     * Extracts a resource from the jar, stores it in a temp file and returns the abolute path to the tempfile
+     */
+    public static synchronized File getResourceFileF(String name) {
         try {
             File f = resourceMap.get(name);
             if (f != null && f.exists()) {
-                return f.getAbsolutePath();
+                return f;
             }
-            String[] parts = name.split("\\.");
+            String[] parts = splitFilename(name);
             f = File.createTempFile(parts[0], parts[1]);
             f.deleteOnExit();
             try (InputStream is = Pjass.class.getClassLoader().getResourceAsStream(name)) {
@@ -946,13 +954,22 @@ public static synchronized String getResourceFile(String name) {
                 byte[] bytes = Utils.convertStreamToBytes(is);
                 Files.write(bytes, f);
                 resourceMap.put(name, f);
-                return f.getAbsolutePath();
+                return f;
             }
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
     }
 
+    @NotNull
+    private static String[] splitFilename(String name) {
+        int dotPos = name.lastIndexOf('.');
+        if (dotPos >= 0) {
+            return new String[] { name.substring(0, dotPos), name.substring(dotPos + 1) };
+        }
+        return new String[] { name, "" };
+    }
+
     private static Map<String, File> resourceMap = new HashMap<>();
 
     public static String elementNameWithPath(AstElementWithNameId n) {