Fix matlab batch path bug (#391)

* install matlab-batch to MATLAB_HOME/bin as workaround for node paths

* remove unused getNthParent method

Author: davidbuzinski

pom.xml

@@ -11,7 +11,7 @@
 	</parent>
 
 	<artifactId>matlab</artifactId>
-	<version>2.15.1-SNAPSHOT</version>
+	<version>2.16.0-SNAPSHOT</version>
 	<packaging>hpi</packaging>
 
 	<name>MATLAB Plugin</name>
@@ -286,4 +286,4 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-</project>
+</project>

src/main/java/com/mathworks/ci/MatlabInstallation.java

@@ -64,13 +64,7 @@ public void buildEnvVars(EnvVars env) {
         if (home == null) {
             return;
         }
-        FilePath matlabHome = new FilePath(new File(home));
-        FilePath matlabBin = new FilePath(matlabHome, "bin");
-        env.put("PATH+matlabroot", matlabBin.getRemote());
-        FilePath matlabBatchFolder = matlabHome.getParent();
-        if (matlabBatchFolder != null) {
-            env.put("PATH+matlabbatch", matlabBatchFolder.getRemote());
-        }
+        env.put("PATH+matlabroot", home + "/bin");
     }
 
     public static MatlabInstallation[] getAll() {

src/main/java/com/mathworks/ci/UseMatlabVersionBuildWrapper.java

@@ -201,11 +201,6 @@ public void setUp(Context context, Run<?, ?> build, FilePath workspace, Launcher
         if (matlabBinDir == null) {
             throw new MatlabNotFoundError(Message.getValue("matlab.not.found.error"));
         }
-        // Add matlab-batch executable in path
-        FilePath batchExecutable = getNthParentFilePath(matlabExecutablePath, 3);
-        if (batchExecutable != null && batchExecutable.exists()) {
-            context.env("PATH+matlabbatch", batchExecutable.getRemote());
-        }
 
         // Add "matlabroot" without bin as env variable which will be available across
         // the build.
@@ -221,19 +216,4 @@ private String getNodeSpecificExecutable(Launcher launcher) {
         return (launcher.isUnix()) ? "/bin/matlab" : "\\bin\\matlab.exe";
     }
 
-    public static FilePath getNthParentFilePath(FilePath path, int levels) {
-        if (path == null || levels < 0) {
-            return null;
-        }
-
-        FilePath currentPath = path;
-        for (int i = 0; i < levels; i++) {
-            if (currentPath == null) {
-                return null;
-            }
-            currentPath = currentPath.getParent();
-        }
-        return currentPath;
-    }
-
 }

src/main/java/com/mathworks/ci/Utilities.java

@@ -40,24 +40,14 @@ public static void addMatlabToEnvPathFromAxis(Computer cmp, TaskListener listene
             return;
         }
 
-        FilePath matlabRoot = getNodeSpecificHome(name,
-                cmp.getNode(), listener, env);
+        FilePath matlabRoot = getNodeSpecificHome(name, cmp.getNode(), listener, env);
 
-        FilePath toolHome = matlabRoot.getParent();
-        if (toolHome == null) {
-            return;
-        }
-        if (matlabRoot != null && toolHome.exists()) {
-            env.put("PATH+matlabbatch", toolHome.getRemote());
-        }
-
-        String matlabExecutablePath = getNodeSpecificHome(name,
-                cmp.getNode(), listener, env).getRemote() + ((Boolean.TRUE.equals(cmp.isUnix())) ? "/bin" : "\\bin");
-        env.put("PATH+matlabroot", matlabExecutablePath);
+        FilePath matlabBin = new FilePath(matlabRoot, "bin");
+        env.put("PATH+matlabroot", matlabBin.getRemote());
 
         // Specify which MATLAB was added to path.
         listener.getLogger().println(
-                "\n" + String.format(Message.getValue("matlab.added.to.path.from"), matlabExecutablePath) + "\n");
+                "\n" + String.format(Message.getValue("matlab.added.to.path.from"), matlabBin.getRemote()) + "\n");
     }
 
     public static FilePath getNodeSpecificHome(String instName, Node node, TaskListener listener, EnvVars env)

src/main/java/com/mathworks/ci/tools/MatlabInstaller.java

@@ -96,7 +96,8 @@ public FilePath performInstallation(ToolInstallation tool, Node node, TaskListen
         mpmInstall(mpm, this.getRelease(), this.getProducts(), matlabRoot, node, log);
 
         // Copy downloaded matlab-batch to tool directory
-        matlabBatch.copyTo(new FilePath(toolRoot, "matlab-batch" + extension));
+        FilePath matlabBin = new FilePath(matlabRoot, "bin");
+        matlabBatch.copyTo(new FilePath(matlabBin, "matlab-batch" + extension));
 
         // Delete temp directory
         tempDir.deleteRecursive();