Fixed file handling

Author: rmraya

createxliff.bat

@@ -1,5 +1,5 @@
 @echo off
 pushd "%~dp0" 
-set OpenXLIFF_HOME=%CD%
+set JavaPM_HOME=%CD%
 popd
-%OpenXLIFF_HOME%\bin\java.exe --module-path %OpenXLIFF_HOME%\lib -m javapm/com.maxprograms.javapm.CreateXliff %* 
+%JavaPM_HOME%\bin\java.exe --module-path %JavaPM_HOME%\lib -m javapm/com.maxprograms.javapm.CreateXliff %* 

createxliff.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 CURRENT=$PWD
 cd `dirname "$0"`
-export OpenXLIFF_HOME=$PWD
+export JavaPM_HOME=$PWD
 cd $CURRENT
-$OpenXLIFF_HOME/bin/java --module-path $OpenXLIFF_HOME/lib -m javapm/com.maxprograms.javapm.CreateXliff $@
+$JavaPM_HOME/bin/java --module-path $JavaPM_HOME/lib -m javapm/com.maxprograms.javapm.CreateXliff $@

mergexliff.bat

@@ -1,5 +1,5 @@
 @echo off
 pushd "%~dp0" 
-set OpenXLIFF_HOME=%CD%
+set JavaPM_HOME=%CD%
 popd
-%OpenXLIFF_HOME%\bin\java.exe --module-path %OpenXLIFF_HOME%\lib -m javapm/com.maxprograms.javapm.MergeXliff %* 
+%JavaPM_HOME%\bin\java.exe --module-path %JavaPM_HOME%\lib -m javapm/com.maxprograms.javapm.MergeXliff %* 

mergexliff.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 CURRENT=$PWD
 cd `dirname "$0"`
-export OpenXLIFF_HOME=$PWD
+export JavaPM_HOME=$PWD
 cd $CURRENT
-$OpenXLIFF_HOME/bin/java --module-path $OpenXLIFF_HOME/lib -m javapm/com.maxprograms.javapm.MergeXliff $@
+$JavaPM_HOME/bin/java --module-path $JavaPM_HOME/lib -m javapm/com.maxprograms.javapm.MergeXliff $@
 

src/com/maxprograms/javapm/CreateXliff.java

@@ -102,6 +102,9 @@ public static void main(String[] args) {
         if (!xliffFile.isAbsolute()) {
             xliff = xliffFile.getAbsoluteFile().getAbsolutePath();
         }
+        if (!xliffFile.getParentFile().exists()) {
+            xliffFile.getParentFile().mkdirs();
+        }
         if (srcLang.isEmpty()) {
             logger.log(Level.ERROR, Messages.getString("CreateXliff.2"));
             return;
@@ -123,15 +126,20 @@ private static void generateXliff(String src, String xliff, String srcLang, Stri
         if (!srcFolder.exists()) {
             throw new IOException(Messages.getString("CreateXliff.3"));
         }
-        File catalogFolder = new File("catalog");
+        String home = System.getenv().get("JavaPM_HOME");
+        if (home == null) {
+            home = System.getProperty("user.dir");
+        }
+        File homeFolder = new File(home);
+        File catalogFolder = new File(homeFolder, "catalog");
         if (!catalogFolder.exists()) {
             throw new IOException(Messages.getString("CreateXliff.4"));
         }
         File catalog = new File(catalogFolder, "catalog.xml");
         if (!catalog.exists()) {
             throw new IOException(Messages.getString("CreateXliff.5"));
         }
-        File srxFolder = new File("srx");
+        File srxFolder = new File(homeFolder, "srx");
         if (!srxFolder.exists()) {
             throw new IOException(Messages.getString("CreateXliff.6"));
         }

src/com/maxprograms/javapm/MergeXliff.java

@@ -93,7 +93,12 @@ private static void mergeXliff(String src, String xliff, boolean unapproved, boo
         if (!srcFolder.exists()) {
             Files.createDirectories(srcFolder.toPath());
         }
-        File catalogFolder = new File("catalog");
+        String home = System.getenv().get("JavaPM_HOME");
+        if (home == null) {
+            home = System.getProperty("user.dir");
+        }
+        File homeFolder = new File(home);
+        File catalogFolder = new File(homeFolder, "catalog");
         if (!catalogFolder.exists()) {
             throw new IOException(Messages.getString("MergeXliff.2"));
         }