[FIX JENKINS-15196] Plugin uses cleartool.cmd instead of cleartool.exe

for Windows slave
jenkinsci · Sep 17, 2012 · aaf0201 · aaf0201
1 parent b3394f7
commit aaf0201
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/java/hudson/plugins/clearcase/ClearCaseInstallation.java b/src/main/java/hudson/plugins/clearcase/ClearCaseInstallation.java
@@ -65,7 +65,7 @@
 public class ClearCaseInstallation extends ToolInstallation implements NodeSpecific<ClearCaseInstallation> {
 
     public final static String NAME = "ClearCase";
-    public final static String CLEARTOOL_EXE = "bin/cleartool.cmd";
+    public final static String CLEARTOOL_EXE = "bin/cleartool";
     public final static String CLEARTOOL_EXE_FALLBACK = "cleartool";
 
     @DataBoundConstructor
@@ -83,10 +83,9 @@ public String getCleartoolExe(Node node, TaskListener listener) throws IOExcepti
         if (StringUtils.isNotBlank(installation.getHome())) {
             // If an installation is specified, use it
             return PathUtil.convertPathForOS(installation.getHome() + "/" + CLEARTOOL_EXE, node.createLauncher(listener).decorateFor(node).isUnix());
-        } else {
-            // Otherwise, fallback to a default case where cleartool is in PATH
-            return CLEARTOOL_EXE_FALLBACK;
         }
+        // Otherwise, fallback to a default case where cleartool is in PATH
+        return CLEARTOOL_EXE_FALLBACK;
     }
 
     @Extension