[Bibdesk-commit] SF.net SVN: bibdesk:[21105] trunk/bibdesk/BDSKTeXTask.m

[<ho...@us...>]

Revision: 21105
          http://sourceforge.net/p/bibdesk/svn/21105
Author:   hofman
Date:     2016-10-19 11:52:34 +0000 (Wed, 19 Oct 2016)
Log Message:
-----------
share code paths for tex task

Modified Paths:
--------------
    trunk/bibdesk/BDSKTeXTask.m

Modified: trunk/bibdesk/BDSKTeXTask.m
===================================================================
--- trunk/bibdesk/BDSKTeXTask.m	2016-10-19 06:27:01 UTC (rev 21104)
+++ trunk/bibdesk/BDSKTeXTask.m	2016-10-19 11:52:34 UTC (rev 21105)
@@ -458,29 +458,26 @@
 }
 
 - (void)addTaskForGeneratedType:(NSUInteger)type {
-    NSString *binPath = nil;
-    NSArray *arguments = nil;
+    NSString *commandKey = nil;
+    NSString *extraArg = nil;
     
-    if (type & (BDSKGeneratedLaTeXMask | BDSKGeneratedLTBMask)) {
+    if ((type & (BDSKGeneratedLaTeXMask | BDSKGeneratedLTBMask))) {
         // This task runs bibtex on our bib file 
-        NSString *command = [[NSUserDefaults standardUserDefaults] stringForKey:BDSKBibTeXBinPathKey];
-        binPath = [BDSKShellCommandFormatter pathByRemovingArgumentsFromCommand:command];
-        NSMutableArray *args = [NSMutableArray array];
-        [args addObjectsFromArray:[BDSKShellCommandFormatter argumentsFromCommand:command]];
-        [args addObject:[texPath baseNameWithoutExtension]];
-        arguments = args;
+        commandKey = BDSKBibTeXBinPathKey;
     } else {
         // This task runs latex on our tex file 
-        NSString *command = [[NSUserDefaults standardUserDefaults] stringForKey:BDSKTeXBinPathKey];
-        binPath = [BDSKShellCommandFormatter pathByRemovingArgumentsFromCommand:command];
-        NSMutableArray *args = [NSMutableArray array];
-        [args addObjectsFromArray:[BDSKShellCommandFormatter argumentsFromCommand:command]];
-        if ([args containsObject:@"-interaction=batchmode"] == NO)
-            [args insertObject:@"-interaction=batchmode" atIndex:0];
-        [args addObject:[texPath baseNameWithoutExtension]];
-        arguments = args;
+        commandKey = BDSKTeXBinPathKey;
+        extraArg = @"-interaction=batchmode";
     }
     
+    NSString *command = [[NSUserDefaults standardUserDefaults] stringForKey:commandKey];
+    NSString *binPath = [BDSKShellCommandFormatter pathByRemovingArgumentsFromCommand:command];
+    NSMutableArray *arguments = [NSMutableArray array];
+    [arguments addObjectsFromArray:[BDSKShellCommandFormatter argumentsFromCommand:command]];
+    if ([arguments containsObject:extraArg] == NO)
+        [arguments insertObject:extraArg atIndex:0];
+    [arguments addObject:[texPath baseNameWithoutExtension]];
+    
     // make sure the PATH environment variable is set correctly, including the path for the TeX installation
     NSMutableDictionary *env = [[environment mutableCopy] autorelease];
     NSString *path = [environment objectForKey:@"PATH"];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.