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

1 files changed, 11 insertions, 13 deletions

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];