svn commit: r1615463 - /tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java

[db...@apache.org]

Author: dblevins
Date: Sun Aug  3 23:16:47 2014
New Revision: 1615463

URL: http://svn.apache.org/r1615463
Log:
test mvn to see if it exists

Modified:
    tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java

Modified: tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java
URL: http://svn.apache.org/viewvc/tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java?rev=1615463&r1=1615462&r2=1615463&view=diff
==============================================================================
--- tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java (original)
+++ tomee/sandbox/release-tools/src/main/java/org/apache/openejb/tools/release/cmd/CompareLibraries.java Sun Aug  3 23:16:47 2014
@@ -123,19 +123,21 @@ public class CompareLibraries {
     }
 
     private static String mvn() {
-        String m2 = System.getenv("M2_HOME");
-        if (m2 == null) {
-            m2 = System.getenv("MAVEN_HOME");
-        }
-        if (m2 == null) {
-            m2 = System.getProperty("M2_HOME");
+        final String[] paths = {
+                System.getenv("M2_HOME") + "/bin/mvn",
+                System.getenv("MAVEN_HOME") + "/bin/mvn",
+                "/usr/bin/mvn",
+                "/usr/local/bin/mvn"
+        };
+
+        for (final String path : paths) {
+            final File file = new File(path);
+            if (file.exists()) {
+                return file.getAbsolutePath();
+            }
         }
 
-        if (m2 == null) {
-            return "mvn";
-        } else {
-            return m2 + "/bin/mvn";
-        }
+        return "mvn";
     }
 
     private static List<FileData> list(final File previousFile) throws IOException {