Compare commits

...
20 Commits
Author SHA1 Message Date
Sparkle-Bot 83f9e29c28 Update Package management files for version 2.11.0-beta.1 2026-11-16 04:24:41 +00:00
Zorg c50cf08f3e Update CHANGELOG for 2.11.0 2026-11-15 20:16:50 -08:00
Zorg 8f90b193cb Add <sparkle:bundleIdentifier> on appcast for signed feeds (#2954) 2026-11-15 20:12:32 -08:00
Zorg 57bb19085b Avoid using host bundle filename for finding bundle to update (#2953)
The user can rename the host bundle filename so it's not reliable and gives a false sense of reliability. We keep matching against the name of the bundle derived from the Info.plist and the bundle identifier.
2026-11-15 20:12:14 -08:00
Niklas Wenzel 5014eb5e63 Activate app if update check is initiated from NSStatusItem (#2950) 2026-11-15 20:11:57 -08:00
1024jp 1967167890 Update Japanese localization (#2948)
- Add missing translations.
- Refine existing translations to make them sound more like macOS.
2026-11-15 20:11:19 -08:00
Sparkle-Bot ab7d712912 Update Package management files for version 2.10.1 2026-10-25 03:05:30 +00:00
Zorg 6e5f706ad2 Update CHANGELOG for 2.10.1 2026-10-24 19:54:14 -07:00
Zorg 0d7b776213 Trim whitespace/newline characters from <sparkle:releaseNotesLink> (#2944)
This fixes a regression introduced in Sparkle 2.9 when signed feeds were added. In our documentation we have suggested surrounding the release notes URL with newline/whitespace for pretty-print formatting reasons. However now that this bug surfaced, the documentation will be updated to remove the extraneous whitespace. Many developers generating appcasts programmatically or with generate_appcast will not run into this issue.
2026-10-24 19:43:52 -07:00
Zorg bd355af936 Fix update being installed before app terminates if it's located in NFC unicode encoded path (#2943)
Normalize the path on both sides (NSRunningApplication and path on disk) consistently using URLByResolvingSymlinksInPath.
2026-10-24 19:43:52 -07:00
Sebastian Livoni 6cf88c720d Complete Danish translation (#2940) 2026-10-24 19:43:52 -07:00
Andrii Selivanov 8287d2ff29 Add missing "Install on Quit" localizations for uk, ru, fr, es, pt-PT. (#2931) 2026-10-24 19:43:52 -07:00
Tiffany Fung a8a8c371f5 Add and update translations for Chinese (Hong Kong) (zh-HK) (#2926) 2026-10-24 19:43:52 -07:00
Leo Camus 4f757ee330 Drop stale sparkle:format when generate_appcast embeds HTML release notes (#2927)
When an existing item's description is rewritten with HTML release notes,
the sparkle:format attribute from a previous plain-text or markdown
description was kept, so Sparkle kept rendering the new HTML as that format.
2026-10-24 19:43:52 -07:00
Leo Camus 15b79334ac Skip en and Base when recording Sparkle locales in generate_appcast (#2925)
The guard compared the directory name (e.g. "en.lproj") against "en" and
"Base", so it never matched and both locales were recorded in
sparkle:deltaFromSparkleLocales, taking up slots of the 7 sampled locales.
Compare the locale name after dropping the .lproj extension instead.
2026-10-24 19:43:52 -07:00
Leo Camus 93265664de Fix appcast child elements being ignored when the Sparkle namespace uses a custom prefix (#2923)
The children of <sparkle:informationalUpdate> and <sparkle:tags> were matched
against their qualified name instead of being resolved through the Sparkle
namespace URI, unlike every other element in the parser.
2026-10-24 19:41:27 -07:00
Sparkle-Bot eef1a539a3 Update Package management files for version 2.10.0 2026-09-13 22:59:24 +00:00
Zorg 19041aaa4f Update CHANGELOG for 2.10.0 with new changes 2026-09-13 15:52:12 -07:00
Zorg c98fe67b3f Fix unused appcast length fallback if server reports no content size (#2922)
Potentially this could result in an indeterminate progress bar even though the appcast specifies the length of the download.
2026-09-13 15:47:39 -07:00
Leo Camus 89f135b438 Fix reading release notes content length from appcast (#2921) 2026-09-13 15:47:39 -07:00
62 changed files with 613 additions and 195 deletions

No files matched your search

+24 -8
View File
@@ -21,6 +21,17 @@
@implementation SUInstaller
static BOOL SUFilenameMatchesAnyName(NSString *filename, NSOrderedSet<NSString *> *names)
{
for (NSString *name in names) {
// This handles unicode normalization but is still a case sensitive comparison
if ([filename compare:name] == NSOrderedSame) {
return YES;
}
}
return NO;
}
+ (nullable NSString *)installSourcePathInUpdateFolder:(NSString *)inUpdateFolder forHost:(SUHost *)host
#if SPARKLE_BUILD_PACKAGE_SUPPORT
isPackage:(BOOL *)isPackagePtr isGuided:(BOOL *)isGuidedPtr
@@ -32,8 +43,15 @@
// Search subdirectories for the application
NSString *currentFile,
*newAppDownloadPath = nil,
*bundleFileName = [[host bundlePath] lastPathComponent],
*alternateBundleFileName = [[host name] stringByAppendingPathExtension:[[host bundlePath] pathExtension]];
*bundleExtension = [[host bundlePath] pathExtension];
NSOrderedSet<NSString *> *hostNames = [host infoDictionaryNames];
NSMutableOrderedSet<NSString *> *bundleFileNames = [NSMutableOrderedSet orderedSet];
for (NSString *hostName in hostNames) {
NSString *bundleFileName = [hostName stringByAppendingPathExtension:bundleExtension];
if (bundleFileName != nil) {
[bundleFileNames addObject:bundleFileName];
}
}
#if SPARKLE_BUILD_PACKAGE_SUPPORT
NSString *fallbackPackagePath = nil;
@@ -41,7 +59,6 @@
BOOL isGuided = YES;
#endif
NSDirectoryEnumerator *dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:inUpdateFolder];
NSString *bundleFileNameNoExtension = [bundleFileName stringByDeletingPathExtension];
while ((currentFile = [dirEnum nextObject])) {
NSString *currentPath = [inUpdateFolder stringByAppendingPathComponent:currentFile];
@@ -78,8 +95,7 @@
NSString *currentExtension = [currentFile pathExtension];
NSString *currentFilenameNoExtension = [currentFilename stringByDeletingPathExtension];
#endif
if ([currentFilename isEqualToString:bundleFileName] ||
[currentFilename isEqualToString:alternateBundleFileName]) // We found one!
if (SUFilenameMatchesAnyName(currentFilename, bundleFileNames)) // We found one!
{
#if SPARKLE_BUILD_PACKAGE_SUPPORT
isPackage = NO;
@@ -89,7 +105,7 @@
#if SPARKLE_BUILD_PACKAGE_SUPPORT
} else if ([currentExtension isEqualToString:@"pkg"] ||
[currentExtension isEqualToString:@"mpkg"]) {
if ([currentFilenameNoExtension isEqualToString:bundleFileNameNoExtension]) {
if (SUFilenameMatchesAnyName(currentFilenameNoExtension, hostNames)) {
isPackage = YES;
newAppDownloadPath = currentPath;
break;
@@ -138,13 +154,13 @@
#endif
if (!newAppDownloadPath) {
SULog(SULogLevelError, @"Searched %@ for %@.(app%@)", inUpdateFolder, bundleFileNameNoExtension,
SULog(SULogLevelError, @"Searched %@ for {%@}.(app%@) or bundle identifier %@", inUpdateFolder, [hostNames.array componentsJoinedByString:@", "],
#if SPARKLE_BUILD_PACKAGE_SUPPORT
@"|pkg"
#else
@""
#endif
);
, host.bundle.bundleIdentifier);
}
return newAppDownloadPath;
}
+24 -4
View File
@@ -1,13 +1,33 @@
# 2.11.0
* Add sparkle:bundleIdentifier element on appcast for signed feeds (#2954) (Zorg)
* Avoid using host bundle filename for finding bundle to update (#2953) (Zorg)
* Activate app if update check is initiated from NSStatusItem (#2950) (Niklas Wenzel)
* Update Japanese localization (#2948) (1024jp)
# 2.10.1
* Fix not trimming whitespace/newline characters from <sparkle:releaseNotesLink> (#2944) (Zorg)
* Fix update being installed prematurely if it's located in NFC unicode encoded path (#2943) (Zorg)
* Update Danish translation (#2940) (Sebastian Livoni)
* Add missing "Install on Quit" localizations for uk, ru, fr, es, pt-PT. (#2931) (Andrii Selivanov)
* Add and update translations for Chinese (Hong Kong) (zh-HK) (#2926) (Tiffany Fung)
* Drop stale sparkle:format when generate_appcast embeds HTML release notes (#2927) (Leo Camus)
* Skip en and Base when recording Sparkle locales in generate_appcast (#2925) (Leo Camus)
* Fix appcast child elements being ignored when the Sparkle namespace uses a custom prefix (#2923) (Leo Camus)
# 2.10.0
* Bump minimum deployment target to macOS 12.0 (#2883, #2892) (Zorg, F1248)
* Remove CocoaPods support (#2899) (Zorg)
* Don't copy updater progress tool app outside of its bundle (#2900) (Zorg)
* Fix re-applying file system compression for delta updates on macOS 27 (#2904) (Zorg)
* Optimize and move updating mdimporter bundles to BinaryDelta applying code (#2905) (Zorg)
* Fix temporary file leaks when applying binary delta file fails (#2906) (Zorg)
* Fix updating not working the first time if bundle ID ends with ".service" or other irregular bundle-like extensions (#2909) (Zorg, youngjunning)
* Fix using appcast length fallback if server reports no content size (resulting in indeterminate progress) (#2922) (Zorg)
* Fix reading release notes content length from appcast for signed feed diagnostics (#2921) (Leo Camus)
* Update European Portuguese localization (#2912) (Andrei)
* Fix temporary file leaks when applying binary delta file fails (#2906) (Zorg)
* Optimize and move updating mdimporter bundles to BinaryDelta applying code (#2905) (Zorg)
* Fix re-applying file system compression for delta updates on macOS 27 (#2904) (Zorg)
* Remove CocoaPods support (#2899) (Zorg)
macOS 12.0 or later is now required (due to Xcode 27 dropping support for deploying to older OS versions). CocoaPods support is also now dropped.
+1 -1
View File
@@ -1 +1 @@
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz", "2.6.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.1/Sparkle-2.6.0-beta.1.tar.xz", "2.6.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.2/Sparkle-2.6.0-beta.2.tar.xz", "2.6.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0/Sparkle-2.6.0.tar.xz", "2.6.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.1/Sparkle-2.6.1.tar.xz", "1.27.2": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.2/Sparkle-1.27.2.tar.xz", "2.6.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.2/Sparkle-2.6.2.tar.xz", "1.27.3": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz", "2.6.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.3/Sparkle-2.6.3.tar.xz", "2.6.4": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz", "2.7.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0-beta.1/Sparkle-2.7.0-beta.1.tar.xz", "2.7.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0/Sparkle-2.7.0.tar.xz", "2.7.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.1/Sparkle-2.7.1.tar.xz", "2.7.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.2/Sparkle-2.7.2.tar.xz", "2.7.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.3/Sparkle-2.7.3.tar.xz", "2.8.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.1/Sparkle-2.8.0-beta.1.tar.xz", "2.8.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.2/Sparkle-2.8.0-beta.2.tar.xz", "2.8.0-beta.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.3/Sparkle-2.8.0-beta.3.tar.xz", "2.8.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0/Sparkle-2.8.0.tar.xLine truncated
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz", "2.6.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.1/Sparkle-2.6.0-beta.1.tar.xz", "2.6.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.2/Sparkle-2.6.0-beta.2.tar.xz", "2.6.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0/Sparkle-2.6.0.tar.xz", "2.6.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.1/Sparkle-2.6.1.tar.xz", "1.27.2": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.2/Sparkle-1.27.2.tar.xz", "2.6.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.2/Sparkle-2.6.2.tar.xz", "1.27.3": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz", "2.6.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.3/Sparkle-2.6.3.tar.xz", "2.6.4": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz", "2.7.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0-beta.1/Sparkle-2.7.0-beta.1.tar.xz", "2.7.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0/Sparkle-2.7.0.tar.xz", "2.7.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.1/Sparkle-2.7.1.tar.xz", "2.7.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.2/Sparkle-2.7.2.tar.xz", "2.7.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.3/Sparkle-2.7.3.tar.xz", "2.8.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.1/Sparkle-2.8.0-beta.1.tar.xz", "2.8.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.2/Sparkle-2.8.0-beta.2.tar.xz", "2.8.0-beta.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.3/Sparkle-2.8.0-beta.3.tar.xz", "2.8.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0/Sparkle-2.8.0.tar.xLine truncated
+3 -3
View File
@@ -98,13 +98,13 @@ SPARKLE_ICON_NAME = AppIcon
// If you change any of these version details, you must increase CURRENT_PROJECT_VERSION
// These variables must have a space after the '=' too
SPARKLE_VERSION_MAJOR = 2
SPARKLE_VERSION_MINOR = 10
SPARKLE_VERSION_MINOR = 11
SPARKLE_VERSION_PATCH = 0
// This should be in SemVer format or empty, ie. "-beta.1"
// These variables must have a space after the '=' too
SPARKLE_VERSION_SUFFIX =
CURRENT_PROJECT_VERSION = 2063
SPARKLE_VERSION_SUFFIX = -beta.1
CURRENT_PROJECT_VERSION = 2066
MARKETING_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)$(SPARKLE_VERSION_SUFFIX)
ALWAYS_SEARCH_USER_PATHS = NO
+2 -2
View File
@@ -312,9 +312,9 @@ static bool SPUValidateStatusCodeAndFailIfInvalid(NSURLResponse * _Nullable resp
return;
}
if (totalBytesExpectedToWrite > 0 && !_receivedExpectedBytes) {
if (!_receivedExpectedBytes) {
_receivedExpectedBytes = YES;
[_delegate downloaderDidReceiveExpectedContentLength:totalBytesExpectedToWrite];
[_delegate downloaderDidReceiveExpectedContentLength:(totalBytesExpectedToWrite != NSURLSessionTransferSizeUnknown) ? totalBytesExpectedToWrite : 0];
}
if (bytesWritten >= 0) {
+3 -3
View File
@@ -2,10 +2,10 @@
import PackageDescription
// Version is technically not required here, SPM doesn't check
let version = "2.10.0"
let version = "2.11.0-beta.1"
// Tag is required to point towards the right asset. SPM requires the tag to follow semantic versioning to be able to resolve it.
let tag = "2.10.0"
let checksum = "1bb2ef0a974eabb745c80c24d758fac251db5fb15f37aca6f70a848753e91f62"
let tag = "2.11.0-beta.1"
let checksum = "584825d2ca202cea34bbe6442c2c3c227030e5fd042dc1dff2b51060cf79c141"
let url = "https://github.com/sparkle-project/Sparkle/releases/download/\(tag)/Sparkle-for-Swift-Package-Manager.zip"
let package = Package(
+6 -18
View File
@@ -8,12 +8,8 @@
<title>Version 2.0 (2 bugs fixed; 3 new features)</title>
<link>https://sparkle-project.org</link>
<sparkle:version>2.0</sparkle:version>
<sparkle:releaseNotesLink>
https://you.com/app/2.0.html
</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>
https://you.com/app/changelog.php
</sparkle:fullReleaseNotesLink>
<sparkle:releaseNotesLink>https://you.com/app/2.0.html</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>https://you.com/app/changelog.php</sparkle:fullReleaseNotesLink>
<pubDate>Wed, 09 Jan 2006 19:20:11 +0000</pubDate>
<enclosure url="https://you.com/app/Your%20Great%20App%202.0.zip" length="1623481" type="application/octet-stream" sparkle:edSignature="WVyVJpOx+a5+vNWJVY79TRjFKveNk+VhGJf2iti4CZtJsJewIUGvh/1AKKEAFbH1qUwx+vro1ECuzOsMmumoBA==" />
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
@@ -23,12 +19,8 @@
<title>Version 1.5 (8 bugs fixed; 2 new features)</title>
<link>https://sparkle-project.org</link>
<sparkle:version>1.5</sparkle:version>
<sparkle:releaseNotesLink>
https://you.com/app/1.5.html
</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>
https://you.com/app/changelog.php?up-to=1.5
</sparkle:fullReleaseNotesLink>
<sparkle:releaseNotesLink>https://you.com/app/1.5.html</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>https://you.com/app/changelog.php?up-to=1.5</sparkle:fullReleaseNotesLink>
<pubDate>Wed, 01 Jan 2006 12:20:11 +0000</pubDate>
<enclosure url="https://you.com/app/Your%20Great%20App%201.5.zip" length="1472893" type="application/octet-stream" sparkle:edSignature="pNFd7KbcQSu+Mq7UYrbQXTPq82luht2ACXm/r2utp1u/Uv/5hWqctdT2jwQgMejW7DRoeV/hVr6J4VdZYdwWDw==" />
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
@@ -38,12 +30,8 @@
<item>
<title>Version 1.4 (5 bugs fixed; 2 new features)</title>
<link>https://sparkle-project.org</link>
<sparkle:releaseNotesLink>
https://you.com/app/1.4.html
</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>
https://you.com/app/changelog.php?up-to=1.4
</sparkle:fullReleaseNotesLink>
<sparkle:releaseNotesLink>https://you.com/app/1.4.html</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>https://you.com/app/changelog.php?up-to=1.4</sparkle:fullReleaseNotesLink>
<sparkle:version>241</sparkle:version>
<sparkle:shortVersionString>1.4</sparkle:shortVersionString>
<pubDate>Wed, 25 Dec 2005 12:20:11 +0000</pubDate>
+4
View File
@@ -141,6 +141,7 @@
720E217B1D0D00BF003A311C /* SPUUpdaterCycle.h in Headers */ = {isa = PBXBuildFile; fileRef = 720E21791D0D00BF003A311C /* SPUUpdaterCycle.h */; };
720E217C1D0D00BF003A311C /* SPUUpdaterCycle.m in Sources */ = {isa = PBXBuildFile; fileRef = 720E217A1D0D00BF003A311C /* SPUUpdaterCycle.m */; };
7210C7681B9A9A1500EB90AC /* SUUnarchiverTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */; };
7212F16330A0311500BC9C7D /* testappcast_bundleIdentifiers.xml in Resources */ = {isa = PBXBuildFile; fileRef = 7210219630A0311500CA3DBD /* testappcast_bundleIdentifiers.xml */; };
72162B081C82C9600013C1C5 /* SULocalizations.h in Headers */ = {isa = PBXBuildFile; fileRef = 72162B071C82C9600013C1C5 /* SULocalizations.h */; };
721BC20E1D1CDE55002BC71E /* SPULocalCacheDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 721BC20C1D1CDE55002BC71E /* SPULocalCacheDirectory.h */; };
721BC20F1D1CDE55002BC71E /* SPULocalCacheDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 721BC20D1D1CDE55002BC71E /* SPULocalCacheDirectory.m */; };
@@ -1053,6 +1054,7 @@
720DC50527A62CDC00DFF3EC /* testappcast_minimumAutoupdateVersionSkipping2.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testappcast_minimumAutoupdateVersionSkipping2.xml; sourceTree = "<group>"; };
720E21791D0D00BF003A311C /* SPUUpdaterCycle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUpdaterCycle.h; sourceTree = "<group>"; };
720E217A1D0D00BF003A311C /* SPUUpdaterCycle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUpdaterCycle.m; sourceTree = "<group>"; };
7210219630A0311500CA3DBD /* testappcast_bundleIdentifiers.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = testappcast_bundleIdentifiers.xml; sourceTree = "<group>"; };
7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SUUnarchiverTest.swift; sourceTree = "<group>"; };
7214B8851D45AD9A00CB5CED /* SPUInstallationType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUInstallationType.h; sourceTree = "<group>"; };
72162B071C82C9600013C1C5 /* SULocalizations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SULocalizations.h; sourceTree = "<group>"; };
@@ -1853,6 +1855,7 @@
725EA4B13027D2AF0041BFA6 /* test-package-update.xml */,
72C56E212F04C28B0005A484 /* testreleasenotes.html */,
5A5DD40324958AFF0045EB3E /* SUUpdateValidatorTest */,
7210219630A0311500CA3DBD /* testappcast_bundleIdentifiers.xml */,
);
path = Resources;
sourceTree = "<group>";
@@ -3175,6 +3178,7 @@
72CCDEBE27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip in Resources */,
726FC0362C1E787A00177986 /* SparkleTestCodeSignApp.aar in Resources */,
722545B626805FF80036465C /* testappcast_info_updates.xml in Resources */,
7212F16330A0311500BC9C7D /* testappcast_bundleIdentifiers.xml in Resources */,
723414172EBFB482009727E0 /* testappcast_arm64HardwareRequirement.xml in Resources */,
7202DC9A269ABD3500737EC4 /* testappcast_phasedRollout.xml in Resources */,
72C6F2DB303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg in Resources */,
+5 -2
View File
@@ -195,8 +195,11 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
- (NSArray<NSRunningApplication *> *)runningApplicationsWithBundle:(NSBundle *)bundle SPU_OBJC_DIRECT
{
// Resolve symlinks otherwise when we compare file paths, we may not realize two paths that are represented differently are the same
NSArray<NSString *> *bundlePathComponents = bundle.bundlePath.stringByResolvingSymlinksInPath.pathComponents;
// Resolve symlinks otherwise when we compare file paths, we may not realize two paths that are represented differently are the same.
// Make sure to use -[NSURL URLByResolvingSymlinksInPath] rather than -[NSString stringByResolvingSymlinksInPath]
// because the former will normalize it to proper file system representation.
// This is also done when retrieving NSRunningApplication path further below
NSArray<NSString *> *bundlePathComponents = bundle.bundleURL.URLByResolvingSymlinksInPath.pathComponents;
NSString *bundleIdentifier = bundle.bundleIdentifier;
NSMutableArray<NSRunningApplication *> *matchedRunningApplications = [[NSMutableArray alloc] init];
@@ -87,7 +87,7 @@ static NSDictionary<NSString *, NSDictionary<NSString *, NSString *> *> *const S
@"Updating %@": @"Aggiornamento di %@",
},
@"ja": @{
@"Cancel Update": @"アップデートを中止",
@"Cancel Update": @"アップデートをキャンセル",
@"Installing update…": @"アップデートをインストールしています…",
@"Updating %@": @"%@をアップデート中",
},
@@ -178,8 +178,8 @@ static NSDictionary<NSString *, NSDictionary<NSString *, NSString *> *> *const S
},
@"zh_HK": @{
@"Cancel Update": @"取消更新",
@"Installing update…": @"安裝緊更新⋯",
@"Updating %@": @"更新緊 %@",
@"Installing update…": @"正在安裝更新⋯",
@"Updating %@": @"正在更新 %@",
},
@"zh_TW": @{
@"Cancel Update": @"取消更新",
+4 -3
View File
@@ -549,9 +549,10 @@
[_checkingController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Checking for updates…", SPARKLE_TABLE, sparkleBundle, nil) maxProgressValue:0.0 statusText:nil];
[_checkingController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:self action:@selector(cancelCheckForUpdates:) isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
// For background applications, obtain focus.
// Useful if the update check is requested from another app like System Preferences.
if ([SUApplicationInfo isBackgroundApplication:[NSApplication sharedApplication]]) {
// Obtain focus. Useful if:
// - The update check is requested from another app (e.g. System Preferences)
// - The user triggers the update check from an NSStatusItem (which does not activate the app)
if (![NSApp isActive]) {
[self _activateApplication];
}
+14 -1
View File
@@ -78,6 +78,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
BOOL _loggedATSWarning;
BOOL _loggedNoSecureKeyWarning;
BOOL _loggedUpdateSecurityPolicyWarning;
BOOL _loggedFeedBundleIdentifierWarning;
BOOL _updatingMainBundle;
}
@@ -380,14 +381,26 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
return NO;
}
} else if (_host.requiresFeedBundleIdentifier) {
if (error != NULL) {
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidUpdaterError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"For security reasons, %@ needs to also be enabled if %@ is enabled for %@. Visit Sparkle's documentation for more information: https://sparkle-project.org/documentation/customization/", SURequireSignedFeedKey, SURequireFeedBundleIdentifierKey, hostName] }];
}
return NO;
}
if (_updatingMainBundle) {
if (!_loggedUpdateSecurityPolicyWarning && mainBundleHost.hasUpdateSecurityPolicy) {
SULog(SULogLevelDefault, @"Warning: %@ has a custom NSUpdateSecurityPolicy in its Info.plist. This may cause issues when installing updates. Please consider removing this key for your builds using Sparkle if you do not really require a custom update security policy.", hostName);
_loggedUpdateSecurityPolicyWarning = YES;
}
if (!_loggedFeedBundleIdentifierWarning && requiresSignedFeed && ![_host boolForInfoDictionaryKey:SURequireFeedBundleIdentifierKey]) {
SULog(SULogLevelDefault, @"Warning: %@ is enabled but %@ is not enabled for %@. For increased security, please consider enabling %@ and adding a %@ element to your signed feed. Visit Sparkle's documentation for more information: https://sparkle-project.org/documentation/#3-segue-for-security-concerns.", SURequireSignedFeedKey, SURequireFeedBundleIdentifierKey, hostName, SURequireFeedBundleIdentifierKey, SUAppcastElementBundleIdentifier);
_loggedFeedBundleIdentifierWarning = YES;
}
}
return YES;
+2
View File
@@ -30,6 +30,8 @@ NS_ASSUME_NONNULL_BEGIN
- (SUAppcast *)copyByFilteringItems:(BOOL (^)(SUAppcastItem *))filterBlock;
@property (readonly, nonatomic, copy) NSSet<NSString *> *bundleIdentifiers;
@end
NS_ASSUME_NONNULL_END
+30 -4
View File
@@ -21,10 +21,17 @@
#include "AppKitPrevention.h"
@interface SUAppcast ()
@property (readonly, nonatomic, copy) NSSet<NSString *> *bundleIdentifiers;
@end
@implementation SUAppcast
@synthesize items = _items;
@synthesize signingValidationStatus = _signingValidationStatus;
@synthesize bundleIdentifiers = _bundleIdentifiers;
- (nullable instancetype)initWithXMLData:(NSData *)xmlData relativeToURL:(NSURL * _Nullable)relativeURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver signingValidationStatus:(SPUAppcastSigningValidationStatus)signingValidationStatus error:(NSError * __autoreleasing *)error
{
@@ -86,6 +93,22 @@
return nil;
}
NSArray *channelNodes = [document nodesForXPath:@"/rss/channel/*" error:errorp];
if (nil == channelNodes) {
return nil;
}
NSMutableSet<NSString *> *bundleIdentifiers = [NSMutableSet set];
for (NSXMLNode *channelNode in channelNodes) {
if ([[self sparkleNamespacedNameOfNode:channelNode] isEqualToString:SUAppcastElementBundleIdentifier]) {
NSString *bundleIdentifier = [channelNode.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
if (bundleIdentifier.length > 0) {
[bundleIdentifiers addObject:bundleIdentifier];
}
}
}
_bundleIdentifiers = [bundleIdentifiers copy];
NSArray *xmlItems = [document nodesForXPath:@"/rss/channel/item" error:errorp];
if (nil == xmlItems) {
return nil;
@@ -145,7 +168,8 @@
[dict setObject:descriptionDict forKey:SURSSElementDescription];
}
} else if ([name isEqualToString:SUAppcastElementReleaseNotesLink]) {
NSString *releaseNotesLink = node.stringValue;
// Trim whitespace to maintain backwards compatibility
NSString *releaseNotesLink = [node.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
if (releaseNotesLink != nil) {
NSDictionary *attributes = [self attributesOfNode:(NSXMLElement *)node];
@@ -177,7 +201,7 @@
NSMutableArray *names = [NSMutableArray array];
NSEnumerator *childEnum = [[node children] objectEnumerator];
for (NSXMLNode *child in childEnum) {
NSString *childName = child.name;
NSString *childName = [self sparkleNamespacedNameOfNode:child];
if (childName) {
[names addObject:childName];
}
@@ -187,12 +211,13 @@
NSMutableSet *informationalUpdateVersions = [NSMutableSet set];
NSEnumerator *childEnum = [[node children] objectEnumerator];
for (NSXMLNode *child in childEnum) {
if ([child.name isEqualToString:SUAppcastElementVersion]) {
NSString *childName = [self sparkleNamespacedNameOfNode:child];
if ([childName isEqualToString:SUAppcastElementVersion]) {
NSString *version = child.stringValue;
if (version != nil) {
[informationalUpdateVersions addObject:version];
}
} else if ([child.name isEqualToString:SUAppcastElementBelowVersion]) {
} else if ([childName isEqualToString:SUAppcastElementBelowVersion]) {
NSString *version = child.stringValue;
if (version != nil) {
// Denote version is used as an upper bound by using '<'
@@ -286,6 +311,7 @@
other->_items = newItems;
other->_signingValidationStatus = _signingValidationStatus;
other->_bundleIdentifiers = _bundleIdentifiers;
return other;
}
+12 -1
View File
@@ -195,7 +195,18 @@
return;
}
if (appcastSigningValidationStatus == SPUAppcastSigningValidationStatusSucceeded && _host.requiresFeedBundleIdentifier) {
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
if (hostBundleIdentifier == nil || ![loadedAppcast.bundleIdentifiers containsObject:hostBundleIdentifier]) {
NSError *bundleIdentifierError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUAppcastParseError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"The update feed is rejected because %@ is enabled and no %@ element in the feed matches the bundle identifier %@.", SURequireFeedBundleIdentifierKey, SUAppcastElementBundleIdentifier, hostBundleIdentifier] }];
[delegate didFailToFetchAppcastWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUAppcastParseError userInfo:@{ NSLocalizedDescriptionKey: SULocalizedStringFromTableInBundle(@"An error occurred while parsing the update feed.", SPARKLE_TABLE, SUSparkleBundle(), nil), NSUnderlyingErrorKey: bundleIdentifierError }]];
return;
}
}
// Now process the loaded appcast and find a suitable update item
[delegate didFinishLoadingAppcast:loadedAppcast];
+9 -9
View File
@@ -567,10 +567,10 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
processedInfoURL = [NSURL URLWithString:infoLinkURLString];
}
if ([processedInfoURL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [processedInfoURL.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
if (processedInfoURL != nil && ([processedInfoURL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [processedInfoURL.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame)) {
infoURL = processedInfoURL;
} else {
SULog(SULogLevelError, @"%@ -%@ Info URL must have a http or https URL scheme.", NSStringFromClass([self class]), NSStringFromSelector(_cmd));
SULog(SULogLevelError, @"Info URL must have a http or https URL scheme: %@", infoLinkURLString);
}
}
}
@@ -622,11 +622,11 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
fileURL = [NSURL URLWithString:fileURLString];
}
if ([fileURL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [fileURL.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
if (fileURL != nil && ([fileURL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [fileURL.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame)) {
_fileURL = fileURL;
} else {
if (error) {
*error = @"File URLs must have a http or https URL scheme";
*error = [NSString stringWithFormat:@"File URL must have a http or https URL scheme: %@", fileURLString];
}
return nil;
}
@@ -825,10 +825,10 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
} else {
url = [NSURL URLWithString:releaseNotesString];
}
if ([url.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [url.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
if (url != nil && ([url.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [url.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame)) {
_releaseNotesURL = url;
} else {
SULog(SULogLevelError, @"Release notes must have a http or https URL scheme.");
SULog(SULogLevelError, @"Release notes must have a http or https URL scheme: %@", releaseNotesString);
_releaseNotesURL = nil;
}
} else if ([_itemDescription hasPrefix:@"http://"] || [_itemDescription hasPrefix:@"https://"]) { // if the description starts with http:// or https:// use that.
@@ -843,7 +843,7 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
#endif
];
long long releaseNotesLength = [(NSString *)[releaseNotesLinkDictionary objectForKey:@"length"] longLongValue];
long long releaseNotesLength = [(NSString *)[releaseNotesLinkDictionary objectForKey:SUAppcastAttributeLength] longLongValue];
_releaseNotesContentLength = (releaseNotesLength > 0) ? (uint64_t)releaseNotesLength : 0;
}
@@ -857,10 +857,10 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
} else {
url = [NSURL URLWithString:fullReleaseNotesString];
}
if ([url.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [url.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
if (url != nil && ([url.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [url.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame)) {
_fullReleaseNotesURL = url;
} else {
SULog(SULogLevelError, @"Full release notes must have a http or https URL scheme.");
SULog(SULogLevelError, @"Full release notes must have a http or https URL scheme: %@", fullReleaseNotesString);
_fullReleaseNotesURL = nil;
}
} else {
+2
View File
@@ -47,6 +47,7 @@ extern NSString *const SUPublicDSAKeyKey;
extern NSString *const SUPublicDSAKeyFileKey;
extern NSString *const SUPublicEDKeyKey;
extern NSString *const SURequireSignedFeedKey;
extern NSString *const SURequireFeedBundleIdentifierKey;
extern NSString *const SUVerifyUpdateBeforeExtractionKey;
extern NSString *const SUAutomaticallyUpdateKey;
extern NSString *const SUAllowsAutomaticUpdatesKey;
@@ -82,6 +83,7 @@ extern NSString *const SUAppcastAttributeLength;
extern NSString *const SUAppcastElementVersion;
extern NSString *const SUAppcastElementShortVersionString;
extern NSString *const SUAppcastElementBundleIdentifier;
extern NSString *const SUAppcastElementCriticalUpdate;
extern NSString *const SUAppcastElementDeltas;
extern NSString *const SUAppcastElementMinimumAutoupdateVersion;
+2
View File
@@ -34,6 +34,7 @@ NSString *const SUPublicDSAKeyKey = @"SUPublicDSAKey";
NSString *const SUPublicDSAKeyFileKey = @"SUPublicDSAKeyFile";
NSString *const SUPublicEDKeyKey = @"SUPublicEDKey";
NSString *const SURequireSignedFeedKey = @"SURequireSignedFeed";
NSString *const SURequireFeedBundleIdentifierKey = @"SURequireFeedBundleIdentifier";
NSString *const SUVerifyUpdateBeforeExtractionKey = @"SUVerifyUpdateBeforeExtraction";
NSString *const SUAutomaticallyUpdateKey = @"SUAutomaticallyUpdate";
NSString *const SUAllowsAutomaticUpdatesKey = @"SUAllowsAutomaticUpdates";
@@ -71,6 +72,7 @@ NSString *const SUAppcastAttributeLength = @"sparkle:length";
NSString *const SUAppcastElementVersion = SUAppcastAttributeVersion;
NSString *const SUAppcastElementShortVersionString = SUAppcastAttributeShortVersionString;
NSString *const SUAppcastElementBundleIdentifier = @"sparkle:bundleIdentifier";
NSString *const SUAppcastElementCriticalUpdate = @"sparkle:criticalUpdate";
NSString *const SUAppcastElementDeltas = @"sparkle:deltas";
NSString *const SUAppcastElementMinimumAutoupdateVersion = @"sparkle:minimumAutoupdateVersion";
+2
View File
@@ -28,6 +28,7 @@ SUHostDefinitionAttribute
@property (readonly, nonatomic, copy) NSString *bundlePath;
@property (readonly, nonatomic, copy) NSString *name;
@property (readonly, nonatomic, copy) NSOrderedSet<NSString *> *infoDictionaryNames;
@property (readonly, nonatomic, copy) NSString *version;
@property (readonly, nonatomic) BOOL validVersion;
@property (readonly, nonatomic, copy) NSString *displayVersion;
@@ -39,6 +40,7 @@ SUHostDefinitionAttribute
@property (nonatomic, readonly) BOOL hasUpdateSecurityPolicy;
@property (nonatomic, readonly) BOOL requiresSignedAppcast;
@property (nonatomic, readonly) BOOL requiresFeedBundleIdentifier;
- (nullable id)objectForInfoDictionaryKey:(NSString *)key ofClass:(Class)aClass;
- (nullable NSNumber *)boolNumberForInfoDictionaryKey:(NSString *)key;
+31 -11
View File
@@ -118,19 +118,34 @@ static void *SUHostObservableContext = &SUHostObservableContext;
return _bundle.bundlePath;
}
- (NSOrderedSet<NSString *> *)infoDictionaryNamesStoppingAtFirstMatch:(BOOL)stopAtFirstMatch SPU_OBJC_DIRECT
{
NSMutableOrderedSet<NSString *> *names = [NSMutableOrderedSet orderedSet];
// Allow host bundle to provide a custom name
for (NSString *key in @[@"SUBundleName", @"CFBundleDisplayName", (__bridge NSString *)kCFBundleNameKey]) {
NSString *name = [self objectForInfoDictionaryKey:key ofClass:NSString.class];
if (name.length > 0) {
[names addObject:name];
if (stopAtFirstMatch) {
break;
}
}
}
return [names copy];
}
- (NSOrderedSet<NSString *> *)infoDictionaryNames
{
return [self infoDictionaryNamesStoppingAtFirstMatch:NO];
}
- (NSString * _Nonnull)name
{
NSString *name;
// Allow host bundle to provide a custom name
name = [self objectForInfoDictionaryKey:@"SUBundleName" ofClass:NSString.class];
if (name && name.length > 0) return name;
name = [self objectForInfoDictionaryKey:@"CFBundleDisplayName" ofClass:NSString.class];
if (name && name.length > 0) return name;
name = [self objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleNameKey ofClass:NSString.class];
if (name && name.length > 0) return name;
NSString *name = [self infoDictionaryNamesStoppingAtFirstMatch:YES].firstObject;
if (name != nil) {
return name;
}
return [[[NSFileManager defaultManager] displayNameAtPath:[self bundlePath]] stringByDeletingPathExtension];
}
@@ -231,6 +246,11 @@ static void *SUHostObservableContext = &SUHostObservableContext;
return [self boolForInfoDictionaryKey:SURequireSignedFeedKey];
}
- (BOOL)requiresFeedBundleIdentifier
{
return [self boolForInfoDictionaryKey:SURequireFeedBundleIdentifierKey];
}
- (SUPublicKeys *)publicKeys
{
return [[SUPublicKeys alloc] initWithEd:[self publicEDKey]
+108
View File
@@ -117,3 +117,111 @@
/* Anonymous system profile information disclosure for update permission dialog */
"Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:";
/* Description text for SUUpdateAlert when the critical update is downloadable. */
"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@ er tilgængelig – du har %3$@. Dette er en vigtig opdatering. Vil du hente den nu?";
/* No comment provided by engineer. */
"%@ is now updated to version %@!" = "%1$@ er nu opdateret til version %2$@!";
/* No comment provided by engineer. */
"%@ is now updated!" = "%@ er nu opdateret!";
/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ er hentet og klar til brug! Dette er en vigtig opdatering. Vil du installere den og genstarte %1$@ nu?";
/* No comment provided by engineer. */
"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@ er tilgængelig, men din version af macOS er for ny til denne opdatering. Opdateringen understøtter højst macOS %3$@.";
/* No comment provided by engineer. */
"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@ er tilgængelig, men din version af macOS er for gammel til at installere den. Mindst macOS %3$@ er påkrævet.";
/* No comment provided by engineer. */
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "%1$@ kan ikke opdateres, når den køres fra den placering, den blev hentet til.";
/* No comment provided by engineer. */
"An error occurred while connecting to the installer. Please try again later." = "Der opstod en fejl under oprettelse af forbindelse til installationsprogrammet. Prøv igen senere.";
/* No comment provided by engineer. */
"An error occurred while launching the installer. Please try again later." = "Der opstod en fejl under åbning af installationsprogrammet. Prøv igen senere.";
/* No comment provided by engineer. */
"An error occurred while running the updater. Please try again later." = "Der opstod en fejl under kørsel af opdateringsprogrammet. Prøv igen senere.";
/* No comment provided by engineer. */
"An error occurred while starting the installer. Please try again later." = "Der opstod en fejl under start af installationsprogrammet. Prøv igen senere.";
/* No comment provided by engineer. */
"An important update to %@ is ready to install" = "En vigtig opdatering til %@ er klar til installering";
/* No comment provided by engineer. */
"Application Name" = "Appnavn";
/* No comment provided by engineer. */
"Application Version" = "Appversion";
/* No comment provided by engineer. */
"CPU is 64-Bit?" = "CPU er 64-bit?";
/* No comment provided by engineer. */
"CPU Speed (MHz)" = "CPU-hastighed (MHz)";
/* No comment provided by engineer. */
"CPU Subtype" = "CPU-undertype";
/* No comment provided by engineer. */
"CPU Type" = "CPU-type";
/* No comment provided by engineer. */
"Failed to resume installing update." = "Installeringen af opdateringen kunne ikke genoptages.";
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
"Install on Quit" = "Installer ved afslutning";
/* No comment provided by engineer. */
"Mac Model" = "Mac-model";
/* No comment provided by engineer. */
"Memory (MB)" = "Hukommelse (MB)";
/* No comment provided by engineer. */
"No" = "Nej";
/* No comment provided by engineer. */
"Number of CPUs" = "Antal CPU’er";
/* No comment provided by engineer. */
"OS Version" = "OS-version";
/* No comment provided by engineer. */
"Preferred Language" = "Foretrukket sprog";
/* No comment provided by engineer. */
"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "Afslut %1$@, flyt den til mappen Apps, åbn det igen derfra og prøv igen.";
/* No comment provided by engineer. */
"The installation failed due to not having permission to write the new update." = "Installeringen mislykkedes, fordi der ikke var tilladelse til at skrive den nye opdatering.";
/* No comment provided by engineer. */
"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "Opdateringen er ikke signeret korrekt og kunne ikke valideres. Prøv igen senere, eller kontakt appens udvikler.";
/* No comment provided by engineer. */
"Unable to Check For Updates" = "Kan ikke søge efter opdateringer";
/* No comment provided by engineer. */
"Update Installed" = "Opdatering installeret";
/* No comment provided by engineer. */
"Version History" = "Versionshistorik";
/* No comment provided by engineer. */
"Yes" = "Ja";
/* No comment provided by engineer. */
"You may need to allow modifications from %1$@ in System Settings under Privacy & Security and App Management to install future updates." = "Du skal muligvis give %1$@ tilladelse til at ændre apps i Systemindstillinger under Anonymitet og sikkerhed > Appadministration for at kunne installere fremtidige opdateringer.";
/* No comment provided by engineer. */
"Your macOS version is too new" = "Din version af macOS er for ny";
/* No comment provided by engineer. */
"Your macOS version is too old" = "Din version af macOS er for gammel";
+3
View File
@@ -64,6 +64,9 @@
/* No comment provided by engineer. */
"Install and Relaunch" = "Instalar y volver a abrir";
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
"Install on Quit" = "Instalar al salir";
/* Run generate_progress_tool_localizations.py after updating. */
"Installing update…" = "Instalando actualización…";
+3
View File
@@ -67,6 +67,9 @@
/* No comment provided by engineer. */
"Install and Relaunch" = "Installer et relancer";
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
"Install on Quit" = "Installer à la fermeture";
/* Run generate_progress_tool_localizations.py after updating. */
"Installing update…" = "Installation de la mise à jour…";
+39 -21
View File
@@ -37,6 +37,9 @@
/* No comment provided by engineer. */
"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@が入手可能ですが、インストールするにはmacOSのバージョンが古すぎます。macOS %3$@以降が必要です。";
/* Mac is too old and update requires Apple silicon Mac */
"%1$@ %2$@ is available but this update requires a new Apple silicon Mac." = "%1$@ %2$@が入手可能ですが、このアップデートにはApple silicon搭載の新しいMacが必要です。";
/* No comment provided by engineer. */
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "この場所ではダウンロードされたアップデートを%1$@に適用できません。";
@@ -50,28 +53,31 @@
"A new version of %@ is ready to install!" = "新しいバージョンの%@が今すぐインストールできます!";
/* No comment provided by engineer. */
"An error occurred in retrieving update information. Please try again later." = "アップデート情報の取得中にエラーが発生しました。あとでやり直してください。";
"An error occurred in retrieving update information. Please try again later." = "アップデート情報の取得中にエラーが起きました。あとでやり直してください。";
/* No comment provided by engineer. */
"An error occurred while connecting to the installer. Please try again later." = "インストーラに接続中にエラーが発生しました。あとでやり直してください。";
"An error occurred while connecting to the installer. Please try again later." = "インストーラに接続中にエラーが起きました。あとでやり直してください。";
/* No comment provided by engineer. */
"An error occurred while downloading the update. Please try again later." = "アップデートをダウンロード中にエラーが発生しました。あとでやり直してください。";
"An error occurred while downloading the update. Please try again later." = "アップデートをダウンロード中にエラーが起きました。あとでやり直してください。";
/* No comment provided by engineer. */
"An error occurred while extracting the archive. Please try again later." = "アーカイブの展開中にエラーが発生しました。あとでやり直してください。";
"An error occurred while downloading the release notes." = "リリースノートのダウンロード中にエラーが起きました。";
/* No comment provided by engineer. */
"An error occurred while launching the installer. Please try again later." = "インストーラを起動中にエラーが発生しました。あとでやり直してください。";
"An error occurred while extracting the archive. Please try again later." = "アーカイブの展開中にエラーが起きました。あとでやり直してください。";
/* No comment provided by engineer. */
"An error occurred while parsing the update feed." = "アップデートフィードを解析中にエラーが発生しました。";
"An error occurred while launching the installer. Please try again later." = "インストーラを起動中にエラーが起きました。あとでやり直してください。";
/* No comment provided by engineer. */
"An error occurred while running the updater. Please try again later." = "アップデータを実行中にエラーが発生しました。あとでやり直してください。";
"An error occurred while parsing the update feed." = "アップデートフィードを解析中にエラーが起きました。";
/* No comment provided by engineer. */
"An error occurred while starting the installer. Please try again later." = "インストーラを始動中にエラーが発生しました。あとでやり直してください。";
"An error occurred while running the updater. Please try again later." = "アップデータを実行中にエラーが起きました。あとでやり直してください。";
/* No comment provided by engineer. */
"An error occurred while starting the installer. Please try again later." = "インストーラを始動中にエラーが起きました。あとでやり直してください。";
/* No comment provided by engineer. */
"An important update to %@ is ready to install" = "%@の重要なアップデートがインストールできます。";
@@ -86,13 +92,13 @@
"Cancel" = "キャンセル";
/* Run generate_progress_tool_localizations.py after updating. */
"Cancel Update" = "アップデートを中止";
"Cancel Update" = "アップデートをキャンセル";
/* No comment provided by engineer. */
"Checking for updates…" = "アップデートを確認しています…";
"Checking for updates…" = "アップデートを確認中…";
/* No comment provided by engineer. */
"CPU is 64-Bit?" = "CPUは64-Bit?";
"CPU is 64-Bit?" = "CPUは64ビット?";
/* No comment provided by engineer. */
"CPU Speed (MHz)" = "CPUスピード (MHz)";
@@ -104,10 +110,10 @@
"CPU Type" = "CPUタイプ";
/* Take care not to overflow the status window. */
"Downloading update…" = "アップデートをダウンロードしています…";
"Downloading update…" = "アップデートをダウンロード中…";
/* Take care not to overflow the status window. */
"Extracting update…" = "アップデートを展開しています…";
"Extracting update…" = "アップデートを抽出中…";
/* No comment provided by engineer. */
"Failed to resume installing update." = "アップデートのインストール再開に失敗しました。";
@@ -146,7 +152,7 @@
"Preferred Language" = "優先する言語";
/* No comment provided by engineer. */
"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "%1$@を終了させ、アプリケーションフォルダに移動の上再度お試しください。";
"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "%1$@を終了させ、アプリケーションフォルダに移動してからやり直してください。";
/* No comment provided by engineer. */
"Ready to Install" = "インストールできます";
@@ -158,22 +164,31 @@
"The installation failed due to not having permission to write the new update." = "新しいアップデートを書き込むアクセス権がないためインストールできませんでした。";
/* No comment provided by engineer. */
"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "アップデートの署名が不適切で認証できませんでした。あとでやり直すかアプリケーション開発者に連絡してください。";
"The updater failed to start. Please verify you have the latest version of %@ and contact the app developer if the issue still persists. Check the Console logs for more information." = "アップデータを起動できませんでした。%@が最新バージョンであることを確認し、それでも問題が解決しない場合はアプリの開発者に連絡してください。詳しくはコンソールログを確認してください。";
/* No comment provided by engineer. */
"Unable to Check For Updates" = "アップデートを確認できませんでした";
"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "アップデートの署名が正しくないため検証できませんでした。あとでやり直すか、アプリの開発者に連絡してください。";
/* No comment provided by engineer. */
"The update feed is improperly signed and could not be validated. Please try again later or contact the app developer." = "アップデートフィードの署名が正しくないため検証できませんでした。あとでやり直すか、アプリの開発者に連絡してください。";
/* No comment provided by engineer. */
"The release notes is improperly signed and could not be validated. Please contact the app developer for more information." = "リリースノートの署名が正しくないため検証できませんでした。詳しくはアプリの開発者に連絡してください。";
/* No comment provided by engineer. */
"Unable to Check For Updates" = "アップデートを確認できません";
/* No comment provided by engineer. */
"Update Error!" = "アップデートエラー!";
/* No comment provided by engineer. */
"Update Installed" = "アップデートがインストールされました";
"Update Installed" = "インストール完了";
/* Run generate_progress_tool_localizations.py after updating. */
"Updating %@" = "%@をアップデート中";
/* No comment provided by engineer. */
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "%1$@をアプリケーションフォルダに移動し、そこから再起動したあとやり直してください。";
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Finderで%1$@をアプリケーションフォルダに移動し、そこから再起動したあとやり直してください。";
/* No comment provided by engineer. */
"Version History" = "バージョン履歴";
@@ -190,23 +205,26 @@
/* No comment provided by engineer. */
"Your macOS version is too old" = "このmacOSのバージョンは古すぎます";
/* Mac is too old and update requires newer hardware */
"Your Mac is too old" = "このMacは古すぎます";
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "最新版を使用しています!";
/* Software Update title/label */
"Software Update" = "ソフトウェア・アップデート";
"Software Update" = "ソフトウェアアップデート";
/* Remind Me Later choice for update alert */
"Remind Me Later" = "あとで通知";
/* Skip This Version choice for update alert */
"Skip This Version" = "このバージョンはスキップ";
"Skip This Version" = "このバージョンをスキップ";
/* Install Update choice for update alert */
"Install Update" = "アップデートをインストール";
/* Automatically download and install updates in the future option for update alert */
"Automatically download and install updates in the future" = "今後はアップデートのダウンロードとインストールを自動で行う";
"Automatically download and install updates in the future" = "今後はアップデートを自動でダウンロードしてインストール";
/* Check for updates automatically response for update permission dialog */
"Check Automatically" = "自動で確認";
+3
View File
@@ -55,6 +55,9 @@
/* No comment provided by engineer. */
"Install and Relaunch" = "Instalar e reiniciar";
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
"Install on Quit" = "Instalar ao sair";
/* Run generate_progress_tool_localizations.py after updating. */
"Installing update…" = "A instalar atualização…";
+3
View File
@@ -55,6 +55,9 @@
/* No comment provided by engineer. */
"Install and Relaunch" = "Установить и перезапустить";
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
"Install on Quit" = "Установить при выходе";
/* Run generate_progress_tool_localizations.py after updating. */
"Installing update…" = "Устанавливаю обновление…";
+3
View File
@@ -55,6 +55,9 @@
/* No comment provided by engineer. */
"Install and Relaunch" = "Встановити та перезавантажити";
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
"Install on Quit" = "Встановити при виході";
/* Run generate_progress_tool_localizations.py after updating. */
"Installing update…" = "Встановлюю оновлення…";
+147 -83
View File
@@ -1,80 +1,101 @@
/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下載並可供使用!此爲重要更新,是否立即安裝並重新啓動 %1$@?";
/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下載並可供使用!是否立即安裝並重新啓動 %1$@?";
/* No comment provided by engineer. */
"%@ %@ is currently the newest version available." = "%1$@ %2$@ 已為現時最新可用的版本。";
/* No comment provided by engineer. */
"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@ 現已可供下載,但你嘅 macOS 版本過新以致無法安裝。此更新僅支援至 macOS %3$@。";
/* No comment provided by engineer. */
"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@ 現已可供下載,但你嘅 macOS 版本過舊以致無法安裝。最低版本需求爲 macOS %3$@。";
/* No comment provided by engineer. */
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "如果從下載位置運行 %1$@,則無法進行更新。";
/* No comment provided by engineer. */
"%1$@ can’t be updated because it was opened from a read-only or a temporary location." = "無法更新 %1$@,因爲佢運行於一個只讀或臨時位置。";
/* No comment provided by engineer. */
"%@ %@ is currently the newest version available." = "%1$@ %2$@ 已係目前最新版本。";
/* No comment provided by engineer. */
"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ 已係目前最新版本。\n(你正在運行版本係 %3$@。)";
"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ 已為現時最新可用的版本。\n(你現時執行的版本是 %3$@。)";
/* Description text for SUUpdateAlert when the critical update is downloadable. */
"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@ 現已可供下載,你目前版本係 %3$@。此爲重要更新,是否立即下載?";
"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@ 現已可供下載,而你的版本是 %3$@。此為重要更新,是否立即下載?";
/* Description text for SUUpdateAlert when the update is downloadable. */
"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ 現已可供下載,你目前版本係 %3$@。是否立即下載?";
"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ 現已可供下載,而你的版本是 %3$@。是否立即下載?";
/* Description text for SUUpdateAlert when the update informational with no download. */
"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ 現已可供下載,你目前版本係 %3$@。要毋要去網站度瞭解更多關於此更新嘅資訊?";
"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ 現已可供下載,而你的版本是 %3$@。你要在網頁上進一步了解關於此更新的資料嗎?";
/* The download progress in a unit of bytes, e.g. 100 KB */
"%@ downloaded" = "%@ 已下載";
"%@ downloaded" = "已下載 %@";
/* No comment provided by engineer. */
"%@ is now updated to version %@!" = "%1$@ 已更新至版本 %2$@!";
/* No comment provided by engineer. */
"%@ is now updated!" = "%@ 已完成更新!";
"%@ is now updated!" = "%@ 已更新!";
/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
"%@ of %@" = "%1$@ / %2$@";
/* No comment provided by engineer. */
"A new version of %@ is available!" = "新版本 %@ 已可供下載!";
/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下載並可供使用!此為重要更新,是否立即安裝並重新啟󠄁動 %1$@?";
/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下載並可供使用!是否立即安裝並重新啟󠄁動 %1$@?";
/* Mac is too old and update requires Apple silicon Mac */
"%1$@ %2$@ is available but this update requires a new Apple silicon Mac." = "%1$@ %2$@ 已可供下載,但此更新需要新的 Apple 晶片 Mac 才能使用。";
/* No comment provided by engineer. */
"A new version of %@ is ready to install!" = "新版本 %@ 已可供安裝!";
"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@ 已可供下載,但你的 macOS 版本太新,無法安裝。此更新只支援至 macOS %3$@。";
/* No comment provided by engineer. */
"An error occurred in retrieving update information. Please try again later." = "擷取更新資訊時發生錯誤。請稍後再試。";
"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@ 已可供下載,但你的 macOS 版本太舊,無法安裝。最低需要 macOS %3$@。";
/* No comment provided by engineer. */
"An error occurred while connecting to the installer. Please try again later." = "連線到安裝程式時發生錯誤。請稍後再試。";
"%1$@ can’t be updated because it was opened from a read-only or a temporary location." = "無法更新 %1$@,因為此 App 已從唯讀或臨時的位置開啟󠄁。";
/* No comment provided by engineer. */
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "如從下載的位置執行 %1$@,則其無法更新。";
/* No comment provided by engineer. */
"A new version of %@ is available!" = "新版本的 %@ 已可供下載!";
/* No comment provided by engineer. */
"A new version of %@ is ready to install!" = "新版本的 %@ 已可供安裝!";
/* No comment provided by engineer. */
"An error occurred in retrieving update information. Please try again later." = "取得更新資料時發生錯誤。請稍後再試。";
/* No comment provided by engineer. */
"An error occurred while connecting to the installer. Please try again later." = "連接安裝程式時發生錯誤。請稍後再試。";
/* No comment provided by engineer. */
"An error occurred while downloading the release notes." = "下載版本備註時發生錯誤。";
/* No comment provided by engineer. */
"An error occurred while downloading the update. Please try again later." = "下載更新時發生錯誤。請稍後再試。";
/* No comment provided by engineer. */
"An error occurred while extracting the archive. Please try again later." = "解壓縮時發生錯誤。請稍後再試。";
"An error occurred while extracting the archive. Please try again later." = "提取封存檔時發生錯誤。請稍後再試。";
/* No comment provided by engineer. */
"An error occurred while launching the installer. Please try again later." = "啓動安裝程式時發生錯誤。請稍後再試。";
"An error occurred while launching the installer. Please try again later." = "啟󠄁動安裝程式時發生錯誤。請稍後再試。";
/* No comment provided by engineer. */
"An error occurred while parsing the update feed." = "剖析更新摘要時發生錯誤。";
"An error occurred while parsing the update feed." = "剖析更新 Feed 時發生錯誤。";
/* No comment provided by engineer. */
"An error occurred while running the updater. Please try again later." = "執行更新程式時發生錯誤。請稍後再試。";
/* No comment provided by engineer. */
"An error occurred while starting the installer. Please try again later." = "啓動安裝程式時發生錯誤。請稍後再試。";
"An error occurred while starting the installer. Please try again later." = "啟󠄁動安裝程式時發生錯誤。請稍後再試。";
/* No comment provided by engineer. */
"An important update to %@ is ready to install" = " %@ 重要更新已可供安裝";
"An important update to %@ is ready to install" = "%@ 的重要更新已可供安裝";
/* Anonymous system profile information disclosure for update permission dialog */
"Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:" = "匿名系統檔案資料將用於協助規劃我們未來的開發工作。如你對此有任何問題,請聯絡我們。\n\n以下資料將會被送出:";
/* No comment provided by engineer. */
"Application Name" = "應用程式名稱";
/* No comment provided by engineer. */
"Application Version" = "應用程式版本";
/* Automatically download and install updates choice for update permission dialog */
"Automatically download and install updates" = "自動下載並安裝更新";
/* Automatically download and install updates in the future option for update alert */
"Automatically download and install updates in the future" = "以後自動下載並安裝更新";
/* No comment provided by engineer. */
"Cancel" = "取消";
@@ -82,44 +103,110 @@
/* Run generate_progress_tool_localizations.py after updating. */
"Cancel Update" = "取消更新";
/* Check for updates automatically response for update permission dialog */
"Check Automatically" = "自動檢查";
/* Title question for update permission dialog */
"Check for updates automatically?" = "自動檢查更新?";
/* No comment provided by engineer. */
"Checking for updates…" = "檢查緊更新⋯";
"Checking for updates…" = "正在檢查更新⋯";
/* No comment provided by engineer. */
"CPU is 64-Bit?" = "CPU 是 64 位?";
/* No comment provided by engineer. */
"CPU Speed (MHz)" = "CPU 速度 (MHz)";
/* No comment provided by engineer. */
"CPU Subtype" = "CPU 子類別";
/* No comment provided by engineer. */
"CPU Type" = "CPU 類型";
/* Don't check for updates automatically response for update permission dialog */
"Don’t Check" = "不要檢查";
/* Take care not to overflow the status window. */
"Downloading update…" = "下載緊更新⋯";
"Downloading update…" = "正在下載更新⋯";
/* Take care not to overflow the status window. */
"Extracting update…" = "解壓緊更新⋯";
"Extracting update…" = "正在提取更新⋯";
/* No comment provided by engineer. */
"Failed to resume installing update." = "嘗試繼續安裝更新失敗。";
"Failed to resume installing update." = "嘗試繼續安裝更新時失敗。";
/* Include anonymous system profile choice for update permission dialog */
"Include anonymous system profile" = "包括匿名系統檔案";
/* No comment provided by engineer. */
"Install and Relaunch" = "安裝並重新啓動";
"Install and Relaunch" = "安裝並重新啟󠄁動";
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
"Install on Quit" = "結束時安裝";
"Install on Quit" = "在結束時安裝";
/* Install Update choice for update alert */
"Install Update" = "安裝更新";
/* Run generate_progress_tool_localizations.py after updating. */
"Installing update…" = "安裝緊更新⋯";
"Installing update…" = "正在安裝更新⋯";
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
"Learn More…" = "瞭解更多⋯";
"Learn More…" = "進一步了解⋯";
/* No comment provided by engineer. */
"Mac Model" = "Mac 型號";
/* No comment provided by engineer. */
"Memory (MB)" = "記憶體 (MB)";
/* No comment provided by engineer. */
"No" = "否";
/* No comment provided by engineer. */
"Number of CPUs" = "CPU 數目";
/* No comment provided by engineer. */
"OK" = "好";
/* No comment provided by engineer. */
"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "請結束 %1$@ 並將其移至「應用程式」檔案夾,從該處重新啓動後再試。";
"OS Version" = "OS 版本";
/* No comment provided by engineer. */
"Preferred Language" = "偏好的語言";
/* No comment provided by engineer. */
"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "結束 %1$@ 並將其移動至「應用程式」資料夾,從此處重新啟󠄁動,然後再試。";
/* No comment provided by engineer. */
"Ready to Install" = "已可供安裝";
/* No comment provided by engineer. */
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ 是否應自動檢查更新?你可隨時從 %1$@ 選單手動檢查更新。";
/* Remind Me Later choice for update alert */
"Remind Me Later" = "稍後提醒我";
/* No comment provided by engineer. */
"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "此更新並未正確簽署且無法驗證。請稍後再試或聯絡軟體開發者。";
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ 是否應該自動檢查更新?你可以隨時從 %1$@ 選單手動檢查更新。";
/* Skip This Version choice for update alert */
"Skip This Version" = "跳過此版本";
/* Software Update title/label */
"Software Update" = "軟件更新";
/* No comment provided by engineer. */
"The installation failed due to not having permission to write the new update." = "安裝失敗,因為未有寫入新更新的權限。";
/* No comment provided by engineer. */
"The release notes is improperly signed and could not be validated. Please contact the app developer for more information." = "版本備註未正確簽署,無法驗證。如需更多資料,請聯絡 App 開發者。";
/* No comment provided by engineer. */
"The update feed is improperly signed and could not be validated. Please try again later or contact the app developer." = "更新 Feed 未正確簽署,無法驗證。請稍後再試,或聯絡 App 開發者。";
/* No comment provided by engineer. */
"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "更新未正確簽署,無法驗證。請稍後再試,或聯絡 App 開發者。";
/* No comment provided by engineer. */
"The updater failed to start. Please verify you have the latest version of %@ and contact the app developer if the issue still persists. Check the Console logs for more information." = "無法啟動更新程式。請核對你有最新版本的 %@,如問題持續,請聯絡 App 開發者。如需更多資料,請檢視控制台記錄。";
/* No comment provided by engineer. */
"Unable to Check For Updates" = "無法檢查更新";
@@ -131,52 +218,29 @@
"Update Installed" = "已安裝更新";
/* Run generate_progress_tool_localizations.py after updating. */
"Updating %@" = "更新緊 %@";
"Updating %@" = "正在更新 %@";
/* No comment provided by engineer. */
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "請將 %1$@ 複製至「應用程式」檔案夾,從該處重新啓動後再試。";
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "使用 Finder 將 %1$@ 複製至「應用程式」資料夾,在該處重新啟󠄁動,然後再試。";
/* No comment provided by engineer. */
"Version History" = "版本歷史";
"Version History" = "版本記錄";
/* No comment provided by engineer. */
"Your macOS version is too new" = "你 macOS 版本過新";
"Yes" = "是";
/* No comment provided by engineer. */
"Your macOS version is too old" = "你 macOS 版本過舊";
"You may need to allow modifications from %1$@ in System Settings under Privacy & Security and App Management to install future updates." = "你可能需要允許 %1$@ 修改「系統設定」中的「私隱與保安」>「App 管理」設定,才能安裝未來的更新。";
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "你用緊最新版本!";
"You’re up to date!" = "你的 App 是最新版本!";
/* Software Update title/label */
"Software Update" = "軟體更新";
/* Mac is too old and update requires newer hardware */
"Your Mac is too old" = "你的 Mac 太舊";
/* Remind Me Later choice for update alert */
"Remind Me Later" = "稍後提醒我";
/* No comment provided by engineer. */
"Your macOS version is too new" = "你的 macOS 版本太新";
/* Skip This Version choice for update alert */
"Skip This Version" = "跳過此版本";
/* No comment provided by engineer. */
"Your macOS version is too old" = "你的 macOS 版本太舊";
/* Install Update choice for update alert */
"Install Update" = "安裝更新";
/* Automatically download and install updates in the future option for update alert */
"Automatically download and install updates in the future" = "以後自動下載並安裝更新";
/* Check for updates automatically response for update permission dialog */
"Check Automatically" = "自動檢查";
/* Don't check for updates automatically response for update permission dialog */
"Don’t Check" = "毋檢查";
/* Title question for update permission dialog */
"Check for updates automatically?" = "自動檢查更新?";
/* Include anonymous system profile choice for update permission dialog */
"Include anonymous system profile" = "包含匿名系統概況";
/* Automatically download and install updates choice for update permission dialog */
"Automatically download and install updates" = "自動下載並安裝更新";
/* Anonymous system profile information disclosure for update permission dialog */
"Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:" = "匿名系統概況資訊可用來協助我等計畫未來開發工作。若對此有任何疑問,請聯繫我等。\n\n以下係會傳送嘅資訊:";
@@ -36,6 +36,8 @@
<true/>
<key>SURequireSignedFeed</key>
<true/>
<key>SURequireFeedBundleIdentifier</key>
<true/>
<key>SUVerifyUpdateBeforeExtraction</key>
<true/>
<key>_SUEnableDebugUpdateCheckIntervals</key>
+1
View File
@@ -7,6 +7,7 @@ IMPORTANT: This file must be re-signed if modifications are made to this file! T
<title>Sparkle Test App Changelog</title>
<description>Most recent changes with links to updates.</description>
<language>en</language>
<sparkle:bundleIdentifier>org.sparkle-project.SparkleTestApp</sparkle:bundleIdentifier>
<item>
<title>Version 2.2</title>
<sparkle:version>2.2</sparkle:version>
@@ -4,6 +4,8 @@
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Both</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
@@ -4,6 +4,8 @@
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>CodeSignedBoth</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
@@ -13,10 +13,6 @@
<dict>
<key>Resources/test-pubkey.pem</key>
<dict>
<key>hash</key>
<data>
pR1EGsp5nhk1vr/xfQPT8es9ZBw=
</data>
<key>hash2</key>
<data>
zD/XQJu4ElPWE6sfqtzoR2vEjdfgi98j/hiRoYZqv9w=
@@ -4,6 +4,8 @@
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>CodeSignedBothNew</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
@@ -13,10 +13,6 @@
<dict>
<key>Resources/test-pubkey.pem</key>
<dict>
<key>hash</key>
<data>
pR1EGsp5nhk1vr/xfQPT8es9ZBw=
</data>
<key>hash2</key>
<data>
zD/XQJu4ElPWE6sfqtzoR2vEjdfgi98j/hiRoYZqv9w=
@@ -4,6 +4,8 @@
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>CodeSignedInvalid</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
@@ -4,6 +4,8 @@
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>CodeSignedInvalidOnly</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
@@ -4,6 +4,8 @@
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>CodeSignedOldED</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
@@ -4,6 +4,8 @@
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>CodeSignedOnly</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
@@ -4,6 +4,8 @@
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>CodeSignedOnlyNew</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
@@ -4,6 +4,8 @@
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>DSAOnly</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
@@ -4,6 +4,8 @@
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>EDOnly</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
@@ -4,6 +4,8 @@
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>None</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleSignature</key>
+8 -3
View File
@@ -5,7 +5,7 @@
<item>
<title>Version 3.0</title>
<pubDate>Sat, 26 Jul 2014 15:20:12 +0000</pubDate>
<sparkle:releaseNotesLink>https://sparkle-project.org/notes/relnote-3.0.txt</sparkle:releaseNotesLink>
<sparkle:releaseNotesLink sparkle:length="1234">https://sparkle-project.org/notes/relnote-3.0.txt</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>https://sparkle-project.org/fullnotes.txt</sparkle:fullReleaseNotesLink>
<link>https://sparkle-project.org</link>
<enclosure url="https://sparkle-project.org/release-3.0.zip" sparkle:version="3.0" length="1346234" />
@@ -13,8 +13,13 @@
<item>
<title>Version 2.0</title>
<pubDate>Sat, 26 Jul 2014 15:20:12 +0000</pubDate>
<sparkle:releaseNotesLink>http://sparkle-project.org/notes/relnote-2.0.txt</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>http://sparkle-project.org/fullnotes.txt</sparkle:fullReleaseNotesLink>
<!-- Test that whitespace/newlines are trimmed too -->
<sparkle:releaseNotesLink>
http://sparkle-project.org/notes/relnote-2.0.txt
</sparkle:releaseNotesLink>
<sparkle:fullReleaseNotesLink>
http://sparkle-project.org/fullnotes.txt
</sparkle:fullReleaseNotesLink>
<link>http://sparkle-project.org</link>
<enclosure url="http://sparkle-project.org/release-2.0.zip" sparkle:version="2.0" length="1346234" />
</item>
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
<channel>
<title>Test</title>
<sparkle:bundleIdentifier>com.example.first</sparkle:bundleIdentifier>
<sparkle:bundleIdentifier>
com.example.second
</sparkle:bundleIdentifier>
<sparkle:bundleIdentifier></sparkle:bundleIdentifier>
<item>
<title>Version 2.0</title>
<enclosure url="http://example.com/test.zip" sparkle:version="2.0" length="1" type="application/octet-stream" sparkle:edSignature="test" />
</item>
</channel>
</rss>
+17
View File
@@ -14,5 +14,22 @@
<pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
<enclosure url="http://localhost:1337/Sparkle_Test_App.zip" customNS:version="2.0" length="1346234" />
</item>
<item>
<title>Version 4.0</title>
<pubDate>Sat, 26 Jul 2014 15:20:13 +0000</pubDate>
<customNS:informationalUpdate>
<customNS:version>2.5</customNS:version>
</customNS:informationalUpdate>
<link>https://sparkle-project.org</link>
<enclosure url="http://localhost:1337/Sparkle_Test_App.zip" customNS:version="4.0" length="1346234" />
</item>
<item>
<title>Version 5.0</title>
<pubDate>Sat, 26 Jul 2014 15:20:14 +0000</pubDate>
<customNS:tags>
<customNS:criticalUpdate/>
</customNS:tags>
<enclosure url="http://localhost:1337/Sparkle_Test_App.zip" customNS:version="5.0" length="1346234" />
</item>
</channel>
</rss>
+29 -1
View File
@@ -1009,12 +1009,17 @@ class SUAppcastTest: XCTestCase {
let appcast = try SUAppcast(xmlData: testData as Data, relativeTo: nil, stateResolver: stateResolver, signingValidationStatus: .skipped)
let items = appcast.items
XCTAssertEqual(2, items.count)
XCTAssertEqual(4, items.count)
XCTAssertEqual("Version 2.0", items[1].title)
XCTAssertEqual("desc", items[1].itemDescription)
XCTAssertNotNil(items[0].releaseNotesURL)
XCTAssertEqual("https://sparkle-project.org/#works", items[0].releaseNotesURL!.absoluteString)
// Child elements of <sparkle:informationalUpdate> and <sparkle:tags> must be
// resolved through the namespace URI too, not through their qualified name
XCTAssertFalse(items[2].isInformationOnlyUpdate)
XCTAssertTrue(items[3].isCriticalUpdate)
} catch let err as NSError {
NSLog("%@", err)
XCTFail(err.localizedDescription)
@@ -1037,12 +1042,14 @@ class SUAppcastTest: XCTestCase {
// Test https
XCTAssertEqual("https://sparkle-project.org/notes/relnote-3.0.txt", items[0].releaseNotesURL?.absoluteString)
XCTAssertEqual(1234, items[0].releaseNotesContentLength)
XCTAssertEqual("https://sparkle-project.org/fullnotes.txt", items[0].fullReleaseNotesURL?.absoluteString)
XCTAssertEqual("https://sparkle-project.org", items[0].infoURL?.absoluteString)
XCTAssertEqual("https://sparkle-project.org/release-3.0.zip", items[0].fileURL?.absoluteString)
// Test http
XCTAssertEqual("http://sparkle-project.org/notes/relnote-2.0.txt", items[1].releaseNotesURL?.absoluteString)
XCTAssertEqual(0, items[1].releaseNotesContentLength)
XCTAssertEqual("http://sparkle-project.org/fullnotes.txt", items[1].fullReleaseNotesURL?.absoluteString)
XCTAssertEqual("http://sparkle-project.org", items[1].infoURL?.absoluteString)
XCTAssertEqual("http://sparkle-project.org/release-2.0.zip", items[1].fileURL?.absoluteString)
@@ -1201,4 +1208,25 @@ class SUAppcastTest: XCTestCase {
XCTFail("Appcast creation should have passed, dropping only the rejected package item")
}
}
func testParseAppcastBundleIdentifiers() throws {
let versionComparator = SUStandardVersionComparator.default
let stateResolver = SPUAppcastItemStateResolver(hostVersion: "1.0", applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
let testURL = Bundle(for: SUAppcastTest.self).url(forResource: "testappcast_bundleIdentifiers", withExtension: "xml")!
let testData = try Data(contentsOf: testURL)
let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver, signingValidationStatus: .succeeded)
XCTAssertEqual(appcast.bundleIdentifiers, ["com.example.first", "com.example.second"])
XCTAssertEqual(appcast.items.count, 1)
let filteredAppcast = appcast.copy(byFilteringItems: { _ in false })
XCTAssertEqual(filteredAppcast.bundleIdentifiers, ["com.example.first", "com.example.second"])
let testURLWithoutBundleIdentifiers = Bundle(for: SUAppcastTest.self).url(forResource: "testappcast", withExtension: "xml")!
let testDataWithoutBundleIdentifiers = try Data(contentsOf: testURLWithoutBundleIdentifiers)
let appcastWithoutBundleIdentifiers = try SUAppcast(xmlData: testDataWithoutBundleIdentifiers, relativeTo: nil, stateResolver: stateResolver, signingValidationStatus: .succeeded)
XCTAssertEqual(appcastWithoutBundleIdentifiers.bundleIdentifiers, [])
}
}
@@ -12,6 +12,7 @@
#import "SUAppcast.h"
#import "SUAppcast+Private.h"
#import "SUAppcastItem.h"
#import "SUAppcastItem+Private.h"
#import "SUAppcastDriver.h"
#import "SUVersionComparisonProtocol.h"
#import "SUStandardVersionComparator.h"
+9 -5
View File
@@ -78,6 +78,7 @@ class ArchiveItem: CustomStringConvertible {
let publicEdKey: Data?
let supportsDSA: Bool
let requiresSignedAppcast: Bool
let bundleIdentifier: String?
let archiveFileAttributes: [FileAttributeKey: Any]
var deltas: [DeltaUpdate]
@@ -174,11 +175,12 @@ class ArchiveItem: CustomStringConvertible {
}
}
init(version: String, shortVersion: String?, feedURL: URL?, requiresSignedAppcast: Bool, minimumSystemVersion: String?, hardwareRequirements: String?, frameworkVersion: String?, sparkleExecutableFileSize: Int?, sparkleLocales: String?, publicEdKey: String?, supportsDSA: Bool, appPath: URL, archivePath: URL) throws {
init(version: String, shortVersion: String?, feedURL: URL?, requiresSignedAppcast: Bool, bundleIdentifier: String?, minimumSystemVersion: String?, hardwareRequirements: String?, frameworkVersion: String?, sparkleExecutableFileSize: Int?, sparkleLocales: String?, publicEdKey: String?, supportsDSA: Bool, appPath: URL, archivePath: URL) throws {
self.version = version
self._shortVersion = shortVersion
self.feedURL = feedURL
self.requiresSignedAppcast = requiresSignedAppcast
self.bundleIdentifier = bundleIdentifier
self.minimumSystemVersion = minimumSystemVersion ?? "12.0"
self.hardwareRequirements = hardwareRequirements
self.frameworkVersion = frameworkVersion
@@ -334,14 +336,15 @@ class ArchiveItem: CustomStringConvertible {
guard filename.hasSuffix(localeExtension) else {
continue
}
let locale = String(filename.dropLast(localeExtensionCount))
// English and Base directories are the least likely to be stripped,
// so let's not bother recording them.
guard filename != "en" && filename != "Base" else {
guard locale != "en" && locale != "Base" else {
continue
}
let locale = String(filename.dropLast(localeExtensionCount))
localesPresent.append(locale)
localeIndex += 1
@@ -368,6 +371,7 @@ class ArchiveItem: CustomStringConvertible {
shortVersion: shortVersion,
feedURL: feedURL,
requiresSignedAppcast: requiresSignedAppcast,
bundleIdentifier: infoPlist[kCFBundleIdentifierKey as String] as? String,
minimumSystemVersion: minimumSystemVersion,
hardwareRequirements: hardwareRequirements,
frameworkVersion: frameworkVersion,
+17 -1
View File
@@ -311,7 +311,20 @@ func writeAppcast(appcastDestPath: URL, keys: PrivateKeys, disableEmbeddedSignWa
requiresSignedAppcast = requiresSignedAppcastFromArchives
}
if requiresSignedAppcast && keys.publicEdKey != nil && keys.privateEdKey != nil {
let existingBundleIdentifiers = Set(channel.elements(forName: SUAppcastElementBundleIdentifier).compactMap({ $0.stringValue?.trimmingCharacters(in: .whitespacesAndNewlines) }))
let archiveBundleIdentifiers = Set(appcast.versionsInFeed.compactMap({ appcast.archives[$0]?.bundleIdentifier }))
var bundleIdentifierIndex = try channel.nodes(forXPath: "item").first?.index ?? channel.childCount
for bundleIdentifier in archiveBundleIdentifiers.subtracting(existingBundleIdentifiers).sorted() {
let bundleIdentifierElement = XMLElement.element(withName: SUAppcastElementBundleIdentifier, uri: sparkleNS) as! XMLElement
bundleIdentifierElement.setChildren([text(bundleIdentifier)])
channel.insertChild(bundleIdentifierElement, at: bundleIdentifierIndex)
bundleIdentifierIndex += 1
}
}
// Keep track of already signed release note files so we avoid
// re-signing the same file in case the developer is using symlinks
// Path -> [(EdSignature, Length)]
@@ -519,6 +532,9 @@ func writeAppcast(appcastDestPath: URL, keys: PrivateKeys, disableEmbeddedSignWa
descElement.setChildren([cdata])
if descriptionFormat != "html" {
descElement.addAttribute(XMLNode.attribute(withName: SUAppcastAttributeFormat, stringValue: descriptionFormat) as! XMLNode)
} else {
// html is the default format, so drop a format left over from previously embedded release notes
descElement.removeAttribute(forName: SUAppcastAttributeFormat)
}
} else if let existingDescriptionElement = findElement(name: "description", parent: item) {
// The update doesn't include embedded release notes. Remove it.