Merge branch 'master' of git://github.com/andymatuschak/Sparkle

sttz · Dec 30, 2009 · 61291c7 · 61291c7
2 parents b90df8b + b96c950
commit 61291c7
Show file tree

Hide file tree

Showing 28 changed files with 2,772 additions and 167 deletions.
diff --git a/SUAppcast.m b/SUAppcast.m
@@ -229,7 +229,7 @@ - (NSXMLNode *)bestNodeInNodes:(NSArray *)nodes
     while ((node = [nodeEnum nextObject]))
     {
         lang = [[node attributeForName:@"xml:lang"] stringValue];
-        [languages addObject:(lang ?: @"")];
+        [languages addObject:(lang ? lang : @"")];
     }
     lang = [[NSBundle preferredLocalizationsFromArray:languages] objectAtIndex:0];
     i = [languages indexOfObject:([languages containsObject:lang] ? lang : @"")];

diff --git a/SUBasicUpdateDriver.m b/SUBasicUpdateDriver.m
@@ -143,7 +143,7 @@ - (void)download:(NSURLDownload *)d decideDestinationWithSuggestedFilename:(NSSt
 	if (tempDir)
 	{
 		tempDir = [tempDir stringByAppendingPathComponent:prefix];
-		unsigned int cnt=1;
+		unsigned int cnt = 1;
 		while ([[NSFileManager defaultManager] fileExistsAtPath:tempDir] && cnt <= 999)
 		{
 			tempDir = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"%@ %u", prefix, cnt++]];
@@ -288,7 +288,8 @@ - (void)relaunchHostApp
 	if ([[updater delegate] respondsToSelector:@selector(pathToRelaunchForUpdater:)])
 		pathToRelaunch = [[updater delegate] pathToRelaunchForUpdater:updater];
 	[NSTask launchedTaskWithLaunchPath:relaunchPath arguments:[NSArray arrayWithObjects:pathToRelaunch, [NSString stringWithFormat:@"%d", [[NSProcessInfo processInfo] processIdentifier]], nil]];
-
+
+	[self setValue:[NSNumber numberWithBool:YES] forKey:@"finished"];
 	[NSApp terminate:self];
 }
 

diff --git a/SUHost.m b/SUHost.m
@@ -191,7 +191,7 @@ - (void)setBool:(BOOL)value forUserDefaultsKey:(NSString *)defaultName
 }
 
 - (id)objectForKey:(NSString *)key {
-    return [self objectForUserDefaultsKey:key] ?: [self objectForInfoDictionaryKey:key];
+    return [self objectForUserDefaultsKey:key] ? [self objectForUserDefaultsKey:key] : [self objectForInfoDictionaryKey:key];
 }
 
 - (BOOL)boolForKey:(NSString *)key {

diff --git a/SUUpdater.m b/SUUpdater.m
@@ -313,7 +313,8 @@ - (NSString *)userAgentString
 	if (customUserAgentString)
 		return customUserAgentString;
 
-	NSString *userAgent = [NSString stringWithFormat:@"%@/%@ Sparkle/%@", [host name], [host displayVersion], [SPARKLE_BUNDLE objectForInfoDictionaryKey:@"CFBundleVersion"] ?: nil];
+	NSString *version = [SPARKLE_BUNDLE objectForInfoDictionaryKey:@"CFBundleVersion"];
+	NSString *userAgent = [NSString stringWithFormat:@"%@/%@ Sparkle/%@", [host name], [host displayVersion], version ? version : @"?"];
 	NSData *cleanedAgent = [userAgent dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES];
 	return [[[NSString alloc] initWithData:cleanedAgent encoding:NSASCIIStringEncoding] autorelease];
 }

diff --git a/Sparkle.xcodeproj/project.pbxproj b/Sparkle.xcodeproj/project.pbxproj
@@ -211,6 +211,10 @@
 		615409C6103BBD9F00125AF1 /* cs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = cs; path = cs.lproj/SUAutomaticUpdateAlert.nib; sourceTree = "<group>"; };
 		615409C7103BBDA600125AF1 /* cs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = cs; path = cs.lproj/SUUpdateAlert.nib; sourceTree = "<group>"; };
 		615AE3CF0D64DC40001CA7BD /* SUModelTranslation.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SUModelTranslation.plist; sourceTree = "<group>"; };
+		6186554210D7484300B1E074 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_PT; path = pt_PT.lproj/SUUpdatePermissionPrompt.nib; sourceTree = "<group>"; };
+		6186554310D7484E00B1E074 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt_PT; path = pt_PT.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		6186554410D7486E00B1E074 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_PT; path = pt_PT.lproj/SUAutomaticUpdateAlert.nib; sourceTree = "<group>"; };
+		6186554510D7488400B1E074 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_PT; path = pt_PT.lproj/SUUpdateAlert.nib; sourceTree = "<group>"; };
 		618915700E35937600B5E981 /* sv */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sv; path = sv.lproj/SUUpdatePermissionPrompt.nib; sourceTree = "<group>"; };
 		618915710E35937600B5E981 /* sv */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sv; path = sv.lproj/SUUpdateAlert.nib; sourceTree = "<group>"; };
 		618915720E35937600B5E981 /* sv */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sv; path = sv.lproj/SUAutomaticUpdateAlert.nib; sourceTree = "<group>"; };
@@ -756,6 +760,7 @@
 				zh_CN,
 				fr_ca,
 				pt_BR,
+				pt_PT,
 			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* Sparkle */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
@@ -974,6 +979,7 @@
 				611A904610240DF700CC659E /* ja */,
 				61E31A80103299500051D188 /* pt_BR */,
 				615409C4103BBC4000125AF1 /* cs */,
+				6186554310D7484E00B1E074 /* pt_PT */,
 			);
 			name = Sparkle.strings;
 			sourceTree = "<group>";
@@ -997,6 +1003,7 @@
 				611A904810240E0600CC659E /* ja */,
 				61E31A81103299560051D188 /* pt_BR */,
 				615409C6103BBD9F00125AF1 /* cs */,
+				6186554410D7486E00B1E074 /* pt_PT */,
 			);
 			name = SUAutomaticUpdateAlert.nib;
 			sourceTree = "<group>";
@@ -1020,6 +1027,7 @@
 				611A904910240E0C00CC659E /* ja */,
 				61E31A821032995F0051D188 /* pt_BR */,
 				615409C7103BBDA600125AF1 /* cs */,
+				6186554510D7488400B1E074 /* pt_PT */,
 			);
 			name = SUUpdateAlert.nib;
 			sourceTree = "<group>";
@@ -1059,6 +1067,7 @@
 				611A904710240DFF00CC659E /* ja */,
 				61E31A7F103299450051D188 /* pt_BR */,
 				615409C5103BBC5000125AF1 /* cs */,
+				6186554210D7484300B1E074 /* pt_PT */,
 			);
 			name = SUUpdatePermissionPrompt.nib;
 			sourceTree = "<group>";

diff --git a/da.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/da.lproj/SUAutomaticUpdateAlert.nib/classes.nib
diff --git a/da.lproj/SUAutomaticUpdateAlert.nib/info.nib b/da.lproj/SUAutomaticUpdateAlert.nib/info.nib
diff --git a/da.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/da.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib
diff --git a/da.lproj/SUAutomaticUpdateAlert.strings b/da.lproj/SUAutomaticUpdateAlert.strings
diff --git a/da.lproj/SUUpdateAlert.nib/classes.nib b/da.lproj/SUUpdateAlert.nib/classes.nib
diff --git a/da.lproj/SUUpdateAlert.nib/info.nib b/da.lproj/SUUpdateAlert.nib/info.nib
diff --git a/da.lproj/SUUpdateAlert.nib/keyedobjects.nib b/da.lproj/SUUpdateAlert.nib/keyedobjects.nib
diff --git a/da.lproj/SUUpdateAlert.strings b/da.lproj/SUUpdateAlert.strings
diff --git a/da.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/da.lproj/SUUpdatePermissionPrompt.nib/classes.nib
diff --git a/da.lproj/SUUpdatePermissionPrompt.nib/data.dependency b/da.lproj/SUUpdatePermissionPrompt.nib/data.dependency
diff --git a/da.lproj/SUUpdatePermissionPrompt.nib/info.nib b/da.lproj/SUUpdatePermissionPrompt.nib/info.nib
diff --git a/da.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/da.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib
diff --git a/da.lproj/Sparkle.strings b/da.lproj/Sparkle.strings