JBDS-3662 - allow for windows path variable to vary depending on if l…

…aunched from cygwin
jbosstools · Mar 7, 2016 · 55c161d · 55c161d
1 parent 72639da
commit 55c161d
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/...rc/org/jboss/tools/openshift/internal/common/core/util/CommandLocationLookupStrategy.java b/...rc/org/jboss/tools/openshift/internal/common/core/util/CommandLocationLookupStrategy.java
@@ -29,12 +29,21 @@ public class CommandLocationLookupStrategy {
 	private static final String LINUX_PATHVAR = "PATH";
 	private static final String WINDOWS_PATHVAR = "Path";
 
+	private static final String LINUX_SEPARATOR = ":";
+	private static final String WIN_SEPARATOR = ";";	
+
 	public static final CommandLocationLookupStrategy WINDOWS_STRATEGY = 
-			new CommandLocationLookupStrategy(WINDOWS_WHERE, ";", WINDOWS_PATHVAR, new String[]{".exe", ".com"}, null);
+			new CommandLocationLookupStrategy(WINDOWS_WHERE, WIN_SEPARATOR,
+					// Windows can use either separator or path variable
+					// based on whether eclipse was launched from cygwin or not
+					System.getenv().get(WINDOWS_PATHVAR) == null ? LINUX_PATHVAR : WINDOWS_PATHVAR,
+					new String[]{".exe", ".com"}, null);
+
+
 	public static final CommandLocationLookupStrategy LINUX_STRATEGY = 
-			new CommandLocationLookupStrategy(LINUX_WHICH, ":", LINUX_PATHVAR, new String[]{}, null);
+			new CommandLocationLookupStrategy(LINUX_WHICH, LINUX_SEPARATOR, LINUX_PATHVAR, new String[]{}, null);
 	public static final CommandLocationLookupStrategy MAC_STRATEGY = 
-			new CommandLocationLookupStrategy(LINUX_WHICH, ":", LINUX_PATHVAR, new String[]{}, new String[]{"bash", "-l", "-i", "-c", "echo $PATH"}, true);
+			new CommandLocationLookupStrategy(LINUX_WHICH, LINUX_SEPARATOR, LINUX_PATHVAR, new String[]{}, new String[]{"bash", "-l", "-i", "-c", "echo $PATH"}, true);
 
 	public static CommandLocationLookupStrategy get() {
 		String os = Platform.getOS();