Adds support for auto-detecting the location of highlight

saagarjha · saagarjha · commit 10ef744de4f3 · 2016-03-09T18:28:05.000-08:00
The plugin now searches for highlight using “which highlight” and falls
back on /opt/local/bin/highlight
diff --git a/QLColorCode.xcodeproj/project.pbxproj b/QLColorCode.xcodeproj/project.pbxproj
@@ -206,7 +206,7 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0730;
 			};
 			buildConfigurationList = 2CA326220896AD4900168862 /* Build configuration list for PBXProject "QLColorCode" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -338,13 +338,15 @@
 		2CA3261F0896AD4900168862 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				OTHER_CFLAGS = "-DDEBUG";
 			};
 			name = Debug;
 		};
 		2CA326200896AD4900168862 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 			};
 			name = Release;
 		};
diff --git a/src/Common.m b/src/Common.m
@@ -69,6 +69,32 @@
     
     // Set up preferences
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    
+    // Try to find highlight location
+    NSString *highlightPath = [defaults valueForKey:@"pathHL"];
+    if (highlightPath == nil) {
+        NSTask *task = [[NSTask alloc] init];
+        [task setLaunchPath:@"/bin/bash"];
+        [task setArguments:@[@"-l", @"-c", @"which highlight"]];
+        NSPipe *pipe;
+        pipe = [NSPipe pipe];
+        [task setStandardOutput: pipe];
+        NSFileHandle *file;
+        file = [pipe fileHandleForReading];
+        [task launch];
+        NSData *data;
+        data = [file readDataToEndOfFile];
+        [task waitUntilExit];
+        highlightPath = [[[[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding] autorelease] stringByTrimmingCharactersInSet:[NSCharacterSet newlineCharacterSet]];
+        [task release];
+        [file closeFile];
+        if (![highlightPath hasPrefix: @"/"] || ![highlightPath hasSuffix: @"highlight"]) { // fallback on default
+            highlightPath = @"/opt/local/bin/highlight";
+        }
+        [defaults setObject:highlightPath forKey:@"pathHL"];
+        [defaults synchronize];
+    }
+    
     NSMutableDictionary *env = [NSMutableDictionary dictionaryWithDictionary:
                                 [[NSProcessInfo processInfo] environment]];
     [env addEntriesFromDictionary:[NSDictionary dictionaryWithObjectsAndKeys:
