[FIXED JENKINS-18235] set PATH with GRAILS_HOME/bin

jenkinsci · Jun 6, 2013 · 250c534 · 250c534
1 parent b64d732
commit 250c534
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/com/g2one/hudson/grails/GrailsBuilder.java b/src/main/java/com/g2one/hudson/grails/GrailsBuilder.java
@@ -15,6 +15,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -203,6 +204,10 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
                 grailsInstallation = grailsInstallation.forEnvironment(env)
                     .forNode(Computer.currentComputer().getNode(), listener);
                 env.put("GRAILS_HOME", grailsInstallation.getHome());
+
+                String path = env.get("PATH");
+                path = path == null ? "" : path + (launcher.isUnix() ? ":" : ";");
+                env.put("PATH", path + grailsInstallation.getHome() + (launcher.isUnix() ? "/bin" : "\\bin"));
             }
 
             String jopts = env.get(JAVA_OPTS);
@@ -252,8 +257,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
                 addArgument("--refresh-dependencies", refreshDependencies, args, env, targetsAndArgs);
 
                 if (!launcher.isUnix()) {
-                    args.prepend("cmd.exe", "/C");
-                    args.add("&&", "exit", "%%ERRORLEVEL%%");
+                    args = args.toWindowsCommand();
                 }
 
                 GrailsConsoleAnnotator gca = new GrailsConsoleAnnotator(listener.getLogger(), build.getCharset());