Fix regression: not adding tool cmdDir to PATH

plugin_ide.core/src-lang/melnorme/lang/ide/core/operations/ToolManager.java

@@ -36,6 +36,7 @@
 import melnorme.lang.ide.core.utils.process.AbstractRunProcessTask;
 import melnorme.lang.ide.core.utils.process.AbstractRunProcessTask.ProcessStartHelper;
 import melnorme.lang.tooling.toolchain.ops.IToolOperationService;
+import melnorme.lang.utils.EnvUtils;
 import melnorme.lang.utils.ProcessUtils;
 import melnorme.lang.utils.validators.PathValidator;
 import melnorme.utilbox.collections.ArrayList2;
@@ -46,6 +47,7 @@
 import melnorme.utilbox.fields.EventSource;
 import melnorme.utilbox.misc.Location;
 import melnorme.utilbox.misc.MiscUtil;
+import melnorme.utilbox.misc.PathUtil;
 import melnorme.utilbox.process.ExternalProcessHelper.ExternalProcessResult;
 import melnorme.utilbox.status.StatusException;
 import melnorme.utilbox.status.StatusLevel;
@@ -117,6 +119,8 @@ public ProcessBuilder createToolProcessBuilder(Indexable<String> commandLine, Lo
 	}
 
 	public ProcessBuilder modifyToolProcessBuilder(ProcessBuilder pb) {
+		Path cmdExePath = PathUtil.createPathOrNull(pb.command().get(0));
+		EnvUtils.addCmdDirToPathEnv(cmdExePath, pb);
 		return pb;
 	}
 

plugin_tooling/src-lang/melnorme/lang/utils/EnvUtils.java

@@ -22,20 +22,29 @@
 public class EnvUtils {
 
 	/** 
-	 * Add given cmdExePath to the PATH. This helps with certain tool issues on certain OSes, 
-	 * like OS X 10.10. See for example: https://github.com/GoClipse/goclipse/issues/91#issuecomment-82555504
+	 * Add the parent directory of given cmdExePath to the PATH. 
+	 * This helps workaround certain tool issues on some OSes like OS X.
+	 * 
+	 * See for example: https://github.com/GoClipse/goclipse/issues/91#issuecomment-82555504
+	 * or: https://github.com/RustDT/RustDT/issues/31
 	 */
-	public static void addDirToPathEnv(Path cmdExePath, ProcessBuilder pb) {
-		Map<String, String> environment = pb.environment();
-
-		String pathEnv = getVarFromEnvMap(environment, "PATH");
-
-		Path cmdDir = cmdExePath.getParent();
-		if(cmdDir == null || !cmdDir.isAbsolute()) {
+	public static void addCmdDirToPathEnv(Path cmdExePath, ProcessBuilder pb) {
+		Location cmdLoc = Location.createValidOrNull(cmdExePath);
+		if(cmdLoc == null) {
+			return;
+		}
+		cmdLoc = cmdLoc.getParent();
+		if(cmdLoc == null) {
 			return;
 		}
+		addLocationToPathEnv(cmdLoc, pb);
+	}
+
+	public static void addLocationToPathEnv(Location dirLoc, ProcessBuilder pb) {
+		Map<String, String> environment = pb.environment();
 
-		String newPathEnv = cmdDir.toString() + File.pathSeparator + StringUtil.nullAsEmpty(pathEnv);
+		String pathEnv = getVarFromEnvMap(environment, "PATH");
+		String newPathEnv = dirLoc.toString() + File.pathSeparator + StringUtil.nullAsEmpty(pathEnv);
 
 		putVarInEnvMap(environment, "PATH", newPathEnv);
 	}

plugin_tooling/src-lang/melnorme/lang/utils/ProcessUtils.java

@@ -50,7 +50,7 @@ public static ProcessBuilder createProcessBuilder(Path cmdExePath, Location work
 		ProcessBuilder pb = createProcessBuilder(cmdExePath, workingDir, arguments);
 
 		if(addCmdDirToPath) {
-			EnvUtils.addDirToPathEnv(cmdExePath, pb);
+			EnvUtils.addCmdDirToPathEnv(cmdExePath, pb);
 		}
 
 		return pb;