Merge pull request #111 from codellm-devkit/make-wrapper-paths-absolute

rahlk · web-flow · commit 34387ac64574 · 2025-02-11T13:19:00.000-05:00
The gradlew/mvnw path must be made absolute
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1 @@
-<<<<<<< HEAD
-version=1.1.1
-
-=======
-version=1.1.0
->>>>>>> 9792b653d3b4509e5b74120747e13e69417da994
+version=1.1.2
diff --git a/src/main/java/com/ibm/cldk/utils/BuildProject.java b/src/main/java/com/ibm/cldk/utils/BuildProject.java
@@ -34,7 +34,7 @@ public class BuildProject {
     public static String getMavenCommand() {
         String mvnSystemCommand = Arrays.stream(System.getenv("PATH").split(System.getProperty("path.separator"))).map(path -> new File(path, System.getProperty("os.name").toLowerCase().contains("windows") ? "mvn.cmd" : "mvn")).filter(File::exists).findFirst().map(File::getAbsolutePath).orElse(null);
         File mvnWrapper = System.getProperty("os.name").toLowerCase().contains("windows") ? new File(projectRootPom, "mvnw.cmd") : new File(projectRootPom, "mvnw");
-        return commandExists(mvnWrapper).getKey() ? mvnWrapper.toString() : mvnSystemCommand;
+        return commandExists(mvnWrapper.getAbsoluteFile()).getKey() ? mvnWrapper.getAbsoluteFile().toString() : mvnSystemCommand;
     }
 
     /**
@@ -46,7 +46,7 @@ public static String getGradleCommand() {
         String gradleSystemCommand = Arrays.stream(System.getenv("PATH").split(System.getProperty("path.separator"))).map(path -> new File(path, System.getProperty("os.name").toLowerCase().contains("windows") ? "gradle.bat" : "gradle")).filter(File::exists).findFirst().map(File::getAbsolutePath).orElse(null);
         File gradleWrapper = System.getProperty("os.name").toLowerCase().contains("windows") ? new File(projectRootPom, "gradlew.bat") : new File(projectRootPom, "gradlew");
 
-        return commandExists(gradleWrapper).getKey() ? gradleWrapper.toString() : gradleSystemCommand;
+        return commandExists(gradleWrapper.getAbsoluteFile()).getKey() ? gradleWrapper.getAbsoluteFile().toString() : gradleSystemCommand;
     }
 
     public static Path tempInitScript;

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public class BuildProject {`
`34`	`34`	`public static String getMavenCommand() {`
`35`	`35`	`String mvnSystemCommand = Arrays.stream(System.getenv("PATH").split(System.getProperty("path.separator"))).map(path -> new File(path, System.getProperty("os.name").toLowerCase().contains("windows") ? "mvn.cmd" : "mvn")).filter(File::exists).findFirst().map(File::getAbsolutePath).orElse(null);`
`36`	`36`	`File mvnWrapper = System.getProperty("os.name").toLowerCase().contains("windows") ? new File(projectRootPom, "mvnw.cmd") : new File(projectRootPom, "mvnw");`
`37`		`- return commandExists(mvnWrapper).getKey() ? mvnWrapper.toString() : mvnSystemCommand;`
	`37`	`+ return commandExists(mvnWrapper.getAbsoluteFile()).getKey() ? mvnWrapper.getAbsoluteFile().toString() : mvnSystemCommand;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
`@@ -46,7 +46,7 @@ public static String getGradleCommand() {`
`46`	`46`	`String gradleSystemCommand = Arrays.stream(System.getenv("PATH").split(System.getProperty("path.separator"))).map(path -> new File(path, System.getProperty("os.name").toLowerCase().contains("windows") ? "gradle.bat" : "gradle")).filter(File::exists).findFirst().map(File::getAbsolutePath).orElse(null);`
`47`	`47`	`File gradleWrapper = System.getProperty("os.name").toLowerCase().contains("windows") ? new File(projectRootPom, "gradlew.bat") : new File(projectRootPom, "gradlew");`
`48`	`48`
`49`		`- return commandExists(gradleWrapper).getKey() ? gradleWrapper.toString() : gradleSystemCommand;`
	`49`	`+ return commandExists(gradleWrapper.getAbsoluteFile()).getKey() ? gradleWrapper.getAbsoluteFile().toString() : gradleSystemCommand;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public static Path tempInitScript;`