F find MeldMerge in 2 different locations #22

Author: actions-user

approvaltests/src/main/java/org/approvaltests/reporters/DiffInfo.java

@@ -4,6 +4,9 @@
 import java.util.HashSet;
 import java.util.List;
 
+import com.spun.util.ArrayUtils;
+import java.util.Objects;
+
 public class DiffInfo
 {
   public String       diffProgram;
@@ -48,10 +51,23 @@ public static String getFirstWorking(String path, String[] paths, String ifNotFo
   }
   public static String[] getProgramFilesPaths()
   {
-    HashSet<String> paths = new HashSet<String>();
+    HashSet<String> paths = new HashSet<>();
     paths.add(System.getenv("ProgramFiles(x86)"));
     paths.add(System.getenv("ProgramFiles"));
     paths.add(System.getenv("ProgramW6432"));
-    return paths.stream().filter(p -> p != null).toArray(s -> new String[s]);
+    return paths.stream().filter(Objects::nonNull).toArray(String[]::new);
+  }
+  public static class One
+  {
+    public static String of(String pathOne, String... paths)
+    {
+      final String[] all = ArrayUtils.combine(new String[]{pathOne}, paths);
+      for (String path : all)
+      {
+        if (new File(path).exists())
+        { return path; }
+      }
+      return pathOne;
+    }
   }
 }

approvaltests/src/main/java/org/approvaltests/reporters/DiffPrograms.java

@@ -6,6 +6,7 @@
 
 import java.util.List;
 
+import org.approvaltests.reporters.DiffInfo.One;
 import org.approvaltests.reporters.intellij.IntelliJPathResolver;
 
 import com.spun.util.ArrayUtils;
@@ -64,6 +65,6 @@ public static class All
   public static class Linux
   {
     public static DiffInfo DIFF_MERGE = new DiffInfo("/usr/bin/diffmerge", "--nosplash %s %s ", TEXT);
-    public static DiffInfo MELD_MERGE = new DiffInfo("/usr/bin/meld", "%s %s ", TEXT);
+    public static DiffInfo MELD_MERGE = new DiffInfo(One.of("/usr/bin/meld", "/usr/local/bin/meld"), "%s %s ", TEXT);
   }
 }