PBEasyPipe: Add method that allows you to specify the environment stuff

Author: pieter

PBEasyPipe.h

@@ -28,5 +28,12 @@
 						 inDir:(NSString *) dir
 				   inputString:(NSString *)input
 				      retValue:(int *)      ret;
++ (NSString*) outputForCommand:(NSString *) cmd
+					  withArgs:(NSArray *)  args
+						 inDir:(NSString *) dir
+		byExtendingEnvironment:(NSDictionary *)dict
+				   inputString:(NSString *)input
+				      retValue:(int *)      ret;
+
 
 @end

PBEasyPipe.m

@@ -51,17 +51,33 @@ + (NSString*) outputForCommand:(NSString *) cmd
 						 inDir:(NSString *) dir
 				      retValue:(int *)      ret
 {
-	return [self outputForCommand:cmd withArgs:args inDir:dir inputString:NULL retValue:ret];
+	return [self outputForCommand:cmd withArgs:args inDir:dir byExtendingEnvironment:nil inputString:nil retValue:ret];
 }	
 
-// TODO: Refactor this to use the function above
 + (NSString*) outputForCommand:(NSString *) cmd
 					  withArgs:(NSArray *)  args
 						 inDir:(NSString *) dir
-				   inputString:(NSString *)input
+				   inputString:(NSString *) input
 				      retValue:(int *)      ret
+{
+	return [self outputForCommand:cmd withArgs:args inDir:dir byExtendingEnvironment:nil inputString:input retValue:ret];
+}
+
++ (NSString*) outputForCommand:(NSString *)    cmd
+					  withArgs:(NSArray *)     args
+						 inDir:(NSString *)    dir
+		byExtendingEnvironment:(NSDictionary *)dict
+				   inputString:(NSString *)    input
+					  retValue:(int *)         ret
 {
 	NSTask *task = [self taskForCommand:cmd withArgs:args inDir:dir];
+
+	if (dict) {
+		NSMutableDictionary *env = [[[NSProcessInfo processInfo] environment] mutableCopy];
+		[env addEntriesFromDictionary:dict];
+		task.environment = env;
+	}
+
 	NSFileHandle* handle = [task.standardOutput fileHandleForReading];
 
 	if (input) {