From bccefa18c72465b2ec41a23eeda5ceb6f4d36204 Mon Sep 17 00:00:00 2001
From: Bibiko <bibiko@eva.mpg.de>
Date: Tue, 9 Nov 2010 11:38:44 +0000
Subject: =?UTF-8?q?=E2=80=A2=20added=20to=20SPStringAddition=20the=20metho?=
 =?UTF-8?q?d=20runBashCommandWithEnvironment:atCurrentDirectoryPath:error?=
 =?UTF-8?q?=20which=20will=20run=20self=20as=20bash=20command=20and=20will?=
 =?UTF-8?q?=20return=20its=20result=20-=20if=20an=20error=20occurred=20it?=
 =?UTF-8?q?=20will=20return=20a=20NSError=20if=20desired=20-=20added=20the?=
 =?UTF-8?q?=20chance=20to=20pass=20shell=20environment=20variables=20and?=
 =?UTF-8?q?=20start=20directory=20for=20future=20usage=20in=20user-definab?=
 =?UTF-8?q?le=20plugins=20written=20as=20scripts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Source/SPTextView.m | 101 +++++++---------------------------------------------
 1 file changed, 12 insertions(+), 89 deletions(-)

(limited to 'Source/SPTextView.m')

diff --git a/Source/SPTextView.m b/Source/SPTextView.m
index 08feffe4..0686fbb2 100644
--- a/Source/SPTextView.m
+++ b/Source/SPTextView.m
@@ -1711,10 +1711,19 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse)
 			if(tagRange.length) {
 				[theHintString flushCachedRegexData];
 				NSRange cmdRange = [theHintString rangeOfRegex:@"(?s)(?<!\\\\)\\$\\(\\s*(.*)\\s*\\)" capture:1L];
-				if(cmdRange.length)
-					[theHintString replaceCharactersInRange:tagRange withString:[self runBashCommand:[theHintString substringWithRange:cmdRange]]];
-				else
+				if(cmdRange.length) {
+					NSError *err = nil;
+					NSString *cmdResult = [[theHintString substringWithRange:cmdRange] runBashCommandWithEnvironment:nil atCurrentDirectoryPath:nil error:&err];
+					if(err == nil) {
+						[theHintString replaceCharactersInRange:tagRange withString:cmdResult];
+					} else {
+						NSString *errorMessage  = [err localizedDescription];
+						SPBeginAlertSheet(NSLocalizedString(@"BASH Error", @"bash error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self window], self, nil, nil,
+										  [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), [theHintString substringWithRange:cmdRange], errorMessage]);
+					}
+				} else {
 					[theHintString replaceCharactersInRange:tagRange withString:@""];
+				}
 			}
 			[theHintString flushCachedRegexData];
 
@@ -1847,92 +1856,6 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse)
 
 }
 
-/**
- * Run 'command' as BASH command(s) and return the result.
- * This task can be interrupted by pressing ⌘.
- */
-- (NSString *)runBashCommand:(NSString *)command
-{
-	BOOL userTerminated = NO;
-
-	NSTask *bashTask = [[NSTask alloc] init];
-	[bashTask setLaunchPath: @"/bin/bash"];
-	[bashTask setArguments:[NSArray arrayWithObjects: @"-c", command, nil]];
-
-	NSPipe *stdout_pipe = [NSPipe pipe];
-	[bashTask setStandardOutput:stdout_pipe];
-	NSFileHandle *stdout_file = [stdout_pipe fileHandleForReading];
-
-	NSPipe *stderr_pipe = [NSPipe pipe];
-	[bashTask setStandardError:stderr_pipe];
-	NSFileHandle *stderr_file = [stderr_pipe fileHandleForReading];
-	[bashTask launch];
-
-	// Listen to ⌘. to terminate
-	while(1) {
-		if(![bashTask isRunning] || [bashTask processIdentifier] == 0) break;
-		NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
-                                   untilDate:[NSDate distantPast]
-                                      inMode:NSDefaultRunLoopMode
-                                     dequeue:YES];
-		usleep(10000);
-		if(!event) continue;
-		if ([event type] == NSKeyDown) {
-			unichar key = [[event characters] length] == 1 ? [[event characters] characterAtIndex:0] : 0;
-			if (([event modifierFlags] & NSCommandKeyMask) && key == '.') {
-				[bashTask terminate];
-				userTerminated = YES;
-				break;
-			}
-		} else {
-			[NSApp sendEvent:event];
-		}
-	}
-
-	[bashTask waitUntilExit];
-
-	if(userTerminated) {
-		if(bashTask) [bashTask release];
-		NSBeep();
-		NSLog(@"“%@” was terminated by user.", command);
-		return @"";
-	}
-
-	// If return from bash re-activate Sequel Pro
-	[NSApp activateIgnoringOtherApps:YES];
-
-	NSInteger status = [bashTask terminationStatus];
-	NSData *outdata  = [stdout_file readDataToEndOfFile];
-	NSData *errdata  = [stderr_file readDataToEndOfFile];
-
-	if(outdata != nil) {
-		NSString *stdout = [[NSString alloc] initWithData:outdata encoding:NSUTF8StringEncoding];
-		NSString *error  = [[[NSString alloc] initWithData:errdata encoding:NSUTF8StringEncoding] autorelease];
-		if(bashTask) [bashTask release];
-		if(stdout != nil) {
-			if (status == 0) {
-				return [stdout autorelease];
-			} else {
-				NSString *error  = [[[NSString alloc] initWithData:errdata encoding:NSUTF8StringEncoding] autorelease];
-				SPBeginAlertSheet(NSLocalizedString(@"BASH Error", @"bash error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self window], self, nil, nil,
-								  [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), command, [error description]]);
-				[stdout release];
-				NSBeep();
-				return @"";
-			}
-		} else {
-			NSLog(@"Couldn't read return string from “%@” by using UTF-8 encoding.", command);
-			NSBeep();
-		}
-	} else {
-		if(bashTask) [bashTask release];
-		NSLog(@"Couldn't read data from command “%@”.", command);
-		NSBeep();
-		return @"";
-	}
-
-}
-
 /**
  * Checks whether the current caret position in inside of a defined snippet range
  */
-- 
cgit v1.2.3