Merge pull request #186 from eharris369/163-updateInstallerAndCodes

Issue #163: Update the installer and accept the new status codes

Author: eharris369

dev/org.eclipse.codewind.core/resources/codewind-installer-linux

@@ -70,9 +70,9 @@ public class InstallUtil {
 	private static String installExec = null;
 
 	public enum InstallStatus {
-		RUNNING(2),
-		INSTALLED(1),
-		NOT_INSTALLED(0),
+		NOT_INSTALLED(200),
+		INSTALLED(201),
+		RUNNING(202),
 		UNKNOWN(-1);
 
 		private int code;
@@ -166,7 +166,7 @@ public static ProcessResult removeCodewind(IProgressMonitor monitor) throws IOEx
 		}
 	}
 
-	public static ProcessResult statusCodewind() throws IOException, TimeoutException {
+	private static ProcessResult statusCodewind() throws IOException, TimeoutException {
 		Process process = null;
 		try {
 			process = runInstaller(STATUS_CMD, null);

dev/org.eclipse.codewind.core/resources/codewind-installer-macos

@@ -48,22 +48,14 @@
 public class CodewindInstall {
 
 	public static boolean isCodewindInstalled() throws InvocationTargetException {
-						
 			try {
-				ProcessResult result = InstallUtil.statusCodewind();
-
-				if (result.getExitValue() == 0) {
-					return false;
-				} else {
-					return true;
-				}
-				
+				InstallStatus status = InstallUtil.getInstallStatus();
+				return status != null && status.isInstalled();
 			} catch (IOException e) {
 				throw new InvocationTargetException(e, "An error occurred trying to determine Codewind status: " + e.getMessage()); //$NON-NLS-1$
 			} catch (TimeoutException e) {
 				throw new InvocationTargetException(e, "Codewind did not return status in the expected time: " + e.getMessage()); //$NON-NLS-1$
 			}
-		
 	}
 
 	public static void codewindInstallerDialog() {