From 737ca96ee49ac80d283f090c29c2a7688ba8bc7c Mon Sep 17 00:00:00 2001 From: randomguy3 Date: Mon, 9 Jan 2012 14:53:50 +0000 Subject: Don't use bash to run pdflatex, run it directly. GNUStep is clever enough to use PATH git-svn-id: https://tikzit.svn.sourceforge.net/svnroot/tikzit/trunk@370 7c02a99a-9b00-45e3-bf44-6f3dd7fddb64 --- tikzit/src/linux/PreviewRenderer.m | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'tikzit') diff --git a/tikzit/src/linux/PreviewRenderer.m b/tikzit/src/linux/PreviewRenderer.m index 5333d65..6f80982 100644 --- a/tikzit/src/linux/PreviewRenderer.m +++ b/tikzit/src/linux/PreviewRenderer.m @@ -88,26 +88,24 @@ // run pdflatex in a bash shell NSTask *latexTask = [[NSTask alloc] init]; [latexTask setCurrentDirectoryPath:tempDir]; - [latexTask setLaunchPath:@"/bin/bash"]; - - // This assumes the user has $PATH set up to find pdflatex - // This should be improved to take other path setups into account - // and to be customisable. - NSString *latexCmd = [NSString stringWithFormat: - @"pdflatex -interaction=nonstopmode -halt-on-error '%@'\n", - texFile]; + // GNUStep is clever enough to use PATH + [latexTask setLaunchPath:@"pdflatex"]; + + NSArray *args = [NSArray arrayWithObjects: + @"-fmt=latex", + @"-output-format=pdf", + @"-interaction=nonstopmode", + @"-halt-on-error", + texFile, + nil]; + [latexTask setArguments:args]; NSPipe *pout = [NSPipe pipe]; - NSPipe *pin = [NSPipe pipe]; [latexTask setStandardOutput:pout]; - [latexTask setStandardInput:pin]; - NSFileHandle *latexIn = [pin fileHandleForWriting]; NSFileHandle *latexOut = [pout fileHandleForReading]; [latexTask launch]; - [latexIn writeData:[latexCmd dataUsingEncoding:NSUTF8StringEncoding]]; - [latexIn closeFile]; [latexTask waitUntilExit]; NSData *data = [latexOut readDataToEndOfFile]; -- cgit v1.2.3