Merge pull request #22 from kolinkrewinkel/polychromatic-v1.0.1

Polychromatic v1.0.1.
kolinkrewinkel · Apr 12, 2014 · ca4d832 · ca4d832
2 parents 189f15b + af60825
commit ca4d832
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/Polychromatic.xcodeproj/project.pbxproj b/Polychromatic.xcodeproj/project.pbxproj
@@ -361,8 +361,8 @@
 				DSTROOT = "$(HOME)";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Frameworks",
-					"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/SharedFrameworks",
+					"$(DEVELOPER_DIR)/../Frameworks",
+					"$(DEVELOPER_DIR)/../SharedFrameworks",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Polychromatic/Polychromatic-Prefix.pch";
@@ -386,8 +386,8 @@
 				DSTROOT = "$(HOME)";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/Frameworks",
-					"$(SYSTEM_APPS_DIR)/Xcode.app/Contents/SharedFrameworks",
+					"$(DEVELOPER_DIR)/../Frameworks",
+					"$(DEVELOPER_DIR)/../SharedFrameworks",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Polychromatic/Polychromatic-Prefix.pch";

diff --git a/Polychromatic/Polychromatic-Info.plist b/Polychromatic/Polychromatic-Info.plist
@@ -26,7 +26,6 @@
 	<array>
 		<string>A2E4D43F-41F4-4FB9-BB94-7177011C9AED</string>
 		<string>640F884E-CE55-4B40-87C0-8869546CAB7A</string>
-		<string>37B30044-3B14-46BA-ABAA-F01000C27B63</string>
 	</array>
 	<key>NSPrincipalClass</key>
 	<string>Polychromatic</string>

diff --git a/Polychromatic/Polychromatic.m b/Polychromatic/Polychromatic.m
@@ -88,7 +88,11 @@ - (void)showInstallWindow:(id)sender
 
         [themes enumerateObjectsUsingBlock:^(NSString *themePath, NSUInteger idx, BOOL *stop) {
             NSString *replacementName = [themePath.lastPathComponent stringByReplacingOccurrencesOfString:@".dvtcolortheme" withString:@" (Polychromatic).dvtcolortheme"];
-            [[NSFileManager defaultManager] copyItemAtPath:[NSString stringWithFormat:@"%@/%@", basePath, themePath] toPath:[NSString stringWithFormat:@"%@/Library/Developer/Xcode/UserData/FontAndColorThemes/%@", NSHomeDirectory(), replacementName] error:&error];
+            NSString *destinationDirectory = [NSString stringWithFormat:@"%@/Library/Developer/Xcode/UserData/FontAndColorThemes", NSHomeDirectory()];
+            NSString *destinationPath = [NSString stringWithFormat:@"%@/%@", destinationDirectory, replacementName];
+
+            [[NSFileManager defaultManager] createDirectoryAtPath:destinationDirectory withIntermediateDirectories:YES attributes:nil error:NULL];
+            [[NSFileManager defaultManager] copyItemAtPath:[NSString stringWithFormat:@"%@/%@", basePath, themePath] toPath:destinationPath error:&error];
         }];
     }
 }

diff --git a/Polychromatic/Utilities/PLYVariableManager.m b/Polychromatic/Utilities/PLYVariableManager.m
@@ -59,7 +59,7 @@ - (NSColor *)colorForVariable:(NSString *)variable inWorkspace:(IDEWorkspace *)w
 {
     NSMutableOrderedSet *variables = [self variableSetForWorkspace:workspace];
 
-    if (!variables)
+    if (!variables && workspace.filePath.pathString)
     {
         variables = [[NSMutableOrderedSet alloc] init];
         [self.workspaces setObject:variables forKey:workspace.filePath.pathString];