Launch the doctor within Terminal as a temporary fix for issue #374.

dwroth · Sep 18, 2014 · 0bf0302 · 0bf0302
1 parent f7fd9e7
commit 0bf0302
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/Appium/Server/Model/AppiumModel.h b/Appium/Server/Model/AppiumModel.h
@@ -43,6 +43,7 @@ typedef enum platformTypes
 -(BOOL) killServer;
 -(BOOL) startServer;
 -(BOOL) startDoctor;
+- (void)startExternalDoctor;
 -(void) reset;
 - (void)setupServerTask:(NSString *)commandString;
 

diff --git a/Appium/Server/Model/AppiumModel.m b/Appium/Server/Model/AppiumModel.m
@@ -560,6 +560,25 @@ -(BOOL) startDoctor
     return self.serverTask.isRunning;
 }
 
+- (void)startExternalDoctor
+{
+	NSString *doctorPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/node_modules/appium/bin/appium-doctor.js"];
+
+	NSString *command;
+
+	if (self.developer.useExternalNodeJSBinary)
+	{
+		command = [NSString stringWithFormat:@"'%@' '%@'", self.developer.externalNodeJSBinaryPath, doctorPath];
+	}
+	else
+	{
+		command = [NSString stringWithFormat:@"'%@%@' '%@'", [[NSBundle mainBundle] resourcePath], @"/node/bin/node", doctorPath];
+	}
+
+	NSAppleScript *script = [[NSAppleScript alloc] initWithSource:[NSString stringWithFormat:@"tell application \"Terminal\" to do script \"%@\"\nactivate application \"Terminal\"", command]];
+	[script executeAndReturnError:nil];
+}
+
 - (void)setupServerTask:(NSString *)commandString
 {
 	[self setServerTask:[NSTask new]];

diff --git a/Appium/Server/Monitor/AppiumMonitorWindowController.m b/Appium/Server/Monitor/AppiumMonitorWindowController.m
@@ -61,6 +61,10 @@ - (IBAction) launchButtonClicked:(id)sender
 
 -(IBAction)doctorButtonClicked:(id)sender
 {
+	// Prevent startDoctor from being run for now due to issue #374
+	[self.model startExternalDoctor];
+	return;
+
     if ([self.model startDoctor])
     {
 		[self closeAllPopovers];