[MNG-7578] Fallback on Linux executable in Windows for findTool utili…

…ty (#861) Co-authored-by: Guillaume Nodet <gnodet@gmail.com>
apache · Dec 18, 2022 · a020540 · a020540
1 parent 15619b5
commit a020540
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
@@ -73,15 +73,24 @@ public String findTool( String toolName )
 
     private static File findTool( String toolName, File installDir )
     {
-        File bin = new File( installDir, "bin" ); //NOI18N
+        File bin = new File( installDir, "bin" ); // NOI18N
         if ( bin.exists() )
         {
-            File tool = new File( bin, toolName + ( Os.isFamily( "windows" ) ? ".exe" : "" ) ); // NOI18N
+            boolean isWindows = Os.isFamily( "windows" ); // NOI18N
+            if ( isWindows )
+            {
+                File tool = new File( bin, toolName + ".exe" );
+                if ( tool.exists() )
+                {
+                    return tool;
+                }
+            }
+            File tool = new File( bin, toolName );
             if ( tool.exists() )
             {
                 return tool;
             }
         }
         return null;
    }
-}
+}