Merge pull request #204 from mathworks/gecko_g2630833

Fix for MATLAB root path displayed in Jenkins build logs.
mathworks · Dec 1, 2021 · 79de63c · 79de63c
2 parents fab4660 + 0c12d73
commit 79de63c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/com/mathworks/ci/UseMatlabVersionBuildWrapper.java b/src/main/java/com/mathworks/ci/UseMatlabVersionBuildWrapper.java
@@ -182,7 +182,7 @@ public void setUp(Context context, Run<?, ?> build, FilePath workspace, Launcher
         setEnv(initialEnvironment);
 
         FilePath matlabExecutablePath = new FilePath(launcher.getChannel(),
-                getNodeSpecificMatlab(Computer.currentComputer(), listener) + "/bin/" + getNodeSpecificExecutable(launcher));
+                getNodeSpecificMatlab(Computer.currentComputer(), listener) + getNodeSpecificExecutable(launcher));
 
         if (!matlabExecutablePath.exists()) {
             throw new MatlabNotFoundError(Message.getValue("matlab.not.found.error"));
@@ -196,6 +196,6 @@ public void setUp(Context context, Run<?, ?> build, FilePath workspace, Launcher
     }
 
     private String getNodeSpecificExecutable(Launcher launcher) {
-        return (launcher.isUnix()) ? "matlab" : "matlab.exe";
+        return (launcher.isUnix()) ? "/bin/matlab" : "\\bin\\matlab.exe";
     }
 }
diff --git a/src/main/java/com/mathworks/ci/Utilities.java b/src/main/java/com/mathworks/ci/Utilities.java
@@ -45,8 +45,9 @@ public static void addMatlabToEnvPathFrmAxis(Computer cmp, TaskListener listener
         }
 
         String matlabExecutablePath = getNodeSpecificHome(name,
-               cmp.getNode(), listener, env) + "/bin";
+               cmp.getNode(), listener, env) + ((Boolean.TRUE.equals(cmp.isUnix()))?"/bin" : "\\bin");
         env.put("PATH+matlabroot", matlabExecutablePath);
+
         // Specify which MATLAB was added to path.
         listener.getLogger().println("\n" + String.format(Message.getValue("matlab.added.to.path.from"), matlabExecutablePath) + "\n");
     }