LH пре 6 година
родитељ
комит
80c6bbc92d

+ 6 - 0
ToolKit/src/main/java/de/nplusc/izc/tools/baseTools/Detectors.java

@@ -82,7 +82,13 @@ public class Detectors
             case "amd64":
                 osarch = "x64";
                 break;
+            case "arm":
+                osarch = "arm";
+                break;
+            default:
+                l.trace("UNKNOWN ARCH:{}",osarchinternal);
         }
+        l.trace("(OSNAME,OSARCH)=({},{})",osname,osarch);
         return new String[]{osname,osarch};
     }
     

+ 1 - 0
iZplPlugins/Editor/src/main/resources/plugin.yml

@@ -7,4 +7,5 @@ supportedoses:
 supportedarchitectures:
   - 'x86'
   - 'x64'
+  - 'arm'
 # x86 or x64 valid

+ 1 - 0
iZplPlugins/JukeBox/src/main/resources/plugin.yml

@@ -7,4 +7,5 @@ supportedoses:
 supportedarchitectures:
   - 'x86'
   - 'x64'
+  - 'arm'
 # x86 or x64 valid

+ 3 - 1
izpl-shared/src/main/java/de/nplusc/izc/iZpl/Utils/shared/PLFileIO.java

@@ -26,7 +26,6 @@ import de.nplusc.izc.iZpl.API.shared.SinglePlayListItem;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.RandomAccessFile;
@@ -242,6 +241,9 @@ public class PLFileIO
                                 {
                                     ln=plbd+ln;//relative pfade absolutisieren
                                 }
+                                //normalize filepaths; linux & windows
+                                ln = ln.replace('/', File.separatorChar);
+                                ln = ln.replace('\\', File.separatorChar);
                                 if(!new File(ln).exists())
                                 {
                                     l.warn("Parser warning on line {} of file {}: File {} does not exist",lne,path,ln);