diff --git a/Frameworks/Sparkle/.clang-format b/Frameworks/Sparkle/.clang-format new file mode 100644 index 000000000..4d178a30f --- /dev/null +++ b/Frameworks/Sparkle/.clang-format @@ -0,0 +1,45 @@ +AccessModifierOffset: -4 +AlignEscapedNewlinesLeft: true +AlignTrailingComments: false +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: false +AllowShortFunctionsOnASingleLine: None +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: false +BinPackParameters: true +BreakBeforeBinaryOperators: true +BreakBeforeBraces: Linux +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: false +ColumnLimit: 0 +CommentPragmas: '^ IWYU pragma:' +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 4 +Cpp11BracedListStyle: false +#DerivePointerAlignment: false +DisableFormat: false +ForEachMacros: foreach,Q_FOREACH +IndentCaseLabels: true +IndentFunctionDeclarationAfterType: true +IndentWidth: 4 +KeepEmptyLinesAtTheStartOfBlocks: false +Language: Cpp +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: All +ObjCSpaceAfterProperty: true +ObjCSpaceBeforeProtocolList: true +#PointerAlignment: Right +SpaceBeforeAssignmentOperators: true +SpaceBeforeParens: ControlStatements +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInCStyleCastParentheses: false +SpacesInContainerLiterals: false +SpacesInParentheses: false +Standard: Cpp03 +TabWidth: 4 +UseTab: Never diff --git a/Frameworks/Sparkle/.gitignore b/Frameworks/Sparkle/.gitignore index a4c9527f1..8b390eb43 100644 --- a/Frameworks/Sparkle/.gitignore +++ b/Frameworks/Sparkle/.gitignore @@ -1,5 +1,4 @@ -# Xcode -build/* +build/ *.pbxuser !default.pbxuser *.mode1v3 @@ -8,11 +7,30 @@ build/* !default.mode2v3 *.perspectivev3 !default.perspectivev3 -*.xcworkspace -!default.xcworkspace -xcuserdata/ -profile +xcuserdata +*.xccheckout *.moved-aside +DerivedData +*.xcuserstate -## Ignore incredibly annoying .DS_Store files .DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk diff --git a/Frameworks/Sparkle/.travis.yml b/Frameworks/Sparkle/.travis.yml new file mode 100644 index 000000000..25bafc13f --- /dev/null +++ b/Frameworks/Sparkle/.travis.yml @@ -0,0 +1,2 @@ +language: objective-c +script: make travis diff --git a/Frameworks/Sparkle/CHANGELOG b/Frameworks/Sparkle/CHANGELOG new file mode 100644 index 000000000..985d84d94 --- /dev/null +++ b/Frameworks/Sparkle/CHANGELOG @@ -0,0 +1,294 @@ +# 1.8.0 + +* New SUDSAVerifier based on up-to-date OS X APIs (Zachary Waldowski) +* Detailed error log for failed signature checks (Kornel Lesiński) +* Converted Sparkle to ARC (C.W. Betts) +* Converted ivars to properties. (Jake Petroules) +* Cocoapod support (Xhacker Liu) +* Quarantine removal on OS X 10.10 (C.W. Betts) +* Updated Japanese localization (1024jp) +* Added Greek localization + +# 1.7.1 + +* Removed option to install unverified updates (Kornel Lesiński) +* Added detailed log when code signing verification fails (Sam Deane) +* Restored original Sparkle icon. (Jake Petroules) +* Switched SUUpdateAlert.xib to AutoLayout (Kornel Lesiński) +* Replace references to andymatuschak.org with sparkle-project.org. (Jake Petroules) +* Several code cleanups, modernizations, fixed warnings and improved code formatting (Jake Petroules) +* Make the repository significantly more organized. (Jake Petroules) +* Xcode project: set organization name and class prefix. (Jake Petroules) +* Link to Foundation and AppKit instead of Cocoa. (Jake Petroules) +* Use new operatingSystemVersion API when available. (Jake Petroules) +* Add .clang-format configuration file for source code formatting. (Jake Petroules) +* Add a target to build Sparkle API documentation using Doxygen. (Jake Petroules) + +# 1.7.0 + +* Dropped support for OS X 10.6. Sparkle now supports 10.7 and newer (including 10.10 Yosemite) on 64-bit Intel Macs (the last 32-bit Mac was released in 2006). +* Removed use of deprecated functions (Zachary Waldowski) +* Switched to modern Obj-C runtime and new literals syntax +* Removed pre-10.7 code. (C.W. Betts) +* Use more Blocks/libdispatch code. (C.W. Betts) +* Cleaned up and improved security of `generate_keys`/`sign_update` scripts + +# 1.6.1 + +* Removed archive password prompt (Kornel Lesiński) +* (Re)fixes bug where URLs are naively double escaped (Andrew Madsen) +* Fixed typo that caused crashes in BinaryDelta (Tamas Lustyik) +* SUStandardVersionComparator.h is public (Vincent CARLIER) +* Remove pre-10.6-specific code. (C.W. Betts) +* Objective C 2 getters and setters. (C.W. Betts) +* Define correct dependencies on locale scripts (Antonin Hildebrand) + +# 1.6.0 + +* Cleaned up and deleted redundant strings files (Kornel Lesiński) +* Modern Objective C syntax, properties where possible. (C.W. Betts) +* Make SUAppcastDelegate a formal protocol. (C.W. Betts) +* Fixed default font in release notes WebView (Kornel Lesiński) +* Configurable name for finish_installation.app (Kornel Lesiński) +* Removed code for 10.4 (Kornel Lesiński) +* Convert all strings files to UTF-8 (UTF-16 must die) (Kornel Lesiński) +* Removing GC target (Matt Thomas) +* finish_installation.app and pkg files will not removed when we use *.pkg installer and restart system in the installer (Takayama Fumihiko) +* Select Korean and Slovak for Sparkle.strings localization (Shon Frazier) +* Updated the Romanian translation (Gabe) +* pt-BR localization polishing (BR Lingo) +* update zh_CN (61) +* Shut up some warnings & make build with newer Xcode (Uli Kusterer) +* Less unsafety with format strings (Uli Kusterer) +* New icon (Rick Fillion) +* fixed a 'content rectangle not entirely onscreen' warning (Simone Manganelli) +* updated sends system profile to use info.plist if user defaults key isn't present (Jamie Pinkham) +* Support for notifications on some updater events (Doug Russell) +* Allow the delegate to trigger a silent install and relaunch (Matt Stevens) +* Support silent relaunches (Matt Stevens) +* Increment the sudden termination counter if installing on quit (Matt Stevens) +* Prompts the user to update after a week (rather than a day) if he doesn't quit the app (Andy Matuschak) +* Adding appcast item element, tag (Andy Matuschak) +* We have this check box that says "Automatically download and install updates in the future." But we only download them automatically. We still ask permission again before installing them. (Andy Matuschak) + +# 1.5.0-beta6 + +* Important Changes + * Sparkle now requires DSA signatures on your updates. Check the documentation for more information on how to set that up if you don't already sign your updates. You can bypass this requirement if you deliver both your appcast and your updates over SSL. +* Sparkle will no longer display release notes located at file:// URLs, since Javascript on such a page would be able to read files on your file system. +* For security reasons, Sparkle will refuse to install updates which appear to "downgrade" the app. +* SUUpdater now implements new keys: "automaticallyDownloadsUpdates", "lastUpdateCheckDate", and "sendsSystemProfile." +* Fixed a bug that could prevent SUProbingUpdateDriver from working. +* Fixed a bug that prevented the updaterWillRelaunchApplication: delegate method from getting called. +* Fixed displaying release notes transmitted "loose" in the key. +* Fixed Sparkle compilation on 10.4 systems. +* Fixed a bug that could cause window confusion if an app changed its LSUIElement at runtime. +* Added support for Sparkle 1.1's behavior of disabling updates when the check interval is 0. +* Sparkle can now handle appending parameters to URLs which already have parameters. +* If an update's sparkle:shortVersionString is the same as the host's CFBundleShortVersionString, the sparkle:version and CFBundleVersion will be presented in parentheticals. + +# 1.5.0-beta5 + +* Important Changes! + * Made every Sparkle class private except for SUUpdater, SUAppcast, SUAppcastItem, and the SUVersionComparisonProtocol. + * There is now a single SUUpdater singleton for every host bundle; instead of -[SUUpdater setHostBundle], you can use +[SUUpdater updaterForBundle]. + * Redefined the (entire) delegate protocol accordingly. + * Renamed -[SUUpdater updatePreferencesChanged] to -[SUUpdater resetUpdateCycle]. This provides better semantics for non-apps, which need to start the update cycle manually. + * -[SUUpdater checkForUpdatesWithDriver] is private. If you were using SUProbingUpdateDriver, you can now use -[SUUpdater checkForUpdateInformation] for a similar effect. + * All the user defaults keys are now private; instead, SUUpdater is KVC-compliant for automaticallyChecksForUpdates, updateCheckInterval, and feedURL. +* Reduced the size of the English-only framework by 25%. +* System profiling information is now only submitted to the server once per week; this will help normalize your statistics across users with different interval preferences. +* The feedParamatersForUpdater: delegate method now requires "displayKey" and "displayVersion" keys so that it can inform the user what's being sent. +* Added a delegate method called pathToRelaunchForUpdater: which can be used for plugins to provide the path which should be used when relaunching the client after installing an update. +* Added support for xml:lang to pick localized nodes in appcasts (for release notes, etc). +* Fixed a bug which would cause the "checking for updates" window to not disappear in certain extraordinary error conditions. +* Fixed a DSA signature checking bug for .tar.gz archives. +* Sparkle now refuses to update on any read-only volume, not just dmgs. +* Sparkle will clean up the host app's name and version before sending it as the user agent string; some non-ASCII characters were causing problems. +* Added an Italian localization courtesy Michele Longhi. +* Added a Swedish localization courtesy Daniel Bergman. +* Fixes to the French localization courtesy Ronald Leroux and Yann Ricqueberg. +* Fixes to the German localization courtesy Sven-S. Porst. +* Fixes to the Russian localization courtesy Alexander Bykov and Anton Sotkov. +* Fixed a number of issues related to archive format detection: I reverted back to extensions from UTIs. +* Focus behavior fixes for LSUIElement apps. +* The status window progress bar now animates even when indeterminate. +* Major refactorings to improve functionality for non-app bundles. + +# 1.5.0-beta4 + +* Fixed a critical bug which prevented non-.dmgs from unarchiving properly. +* Added reporting of 64-bit capability to the profiling system. + +# 1.5.0-beta3 + +* Added a new delegate method to SUUpdater.h to allow delegates to specify custom version comparators. +* Added a German localization, courtesy the Camino localizer team: Dominik Tobschall, Tobias Stohr, and Friedemann Bochow. +* Bug fixes: + * Fixed a serious bug which could cause a server to be DDoS'd (or the host app to crash!) if an appcast fails to be parsed. + * Fixed .tbz extraction if the archive was made with Stuffit. + * Fixed support for .tar.bz2 and .tar.gz; Sparkle has to assume the archive is a tar when it sees "bz2" and "gz"; don't use those without tarring. + * Fixed a typo which caused the shouldPromptForPermissionToCheckForUpdatesToHostBundle: method to not work in 1.5b2. + * Fixed .zip extraction on Tiger (Apple changed the UTI between releases) + * Fixed a crasher on Tiger. + * Fixed display of the default app icon when the host app doesn't have an icon. + * Sparkle now displays a sensible progress string and uses an indeterminate progress bar when the server doesn't report a file size. + * Fixed some memory leaks. + + # 1.5.0-beta2 + + * Compatibility Issues: + * Most of the delegate method selectors have changed to scale better. See SUUpdater.h for changes; you'll likely have to make changes if you implement any delegate methods. + * If you're using .tar.gz or .tar.bz2 archives, name them ".tbz" or ".tgz" instead; Sparkle now uses UTIs for archive detection, and it's not smart about double extensions. + * I'm no longer supporting 10.3. This may or may not work on Panther—probably not. + * Sparkle's no longer built for ppc64 by default. If you want to ship that, feel free to build your own, but this saves a few hundred k. +* Enhancements: + * Sparkle now detects if the preferences for automatic update checks or the time interval change mid-cycle. + * If your product is a non-.app, you need to clue Sparkle in on the change by calling [[SUUpdater sharedUpdater] updatePreferencesChanged]. + * Added a cancel to the "checking for updates..." dialog. + * Sparkle now cleans up all its litter in /tmp. + * Made SUUpdater's delegate an IBOutlet so you can hook it up in IB. +* Bug fixes: + * Sparkle no longer crashes on non-GC hosts when the user cancels an update's downloads. + * Sparkle no longer gets stuck in an inconsistent state or crashes when it can't parse the appcast on scheduled updates. + * Added the sharedUpdater method to SUUpdater, as it should have been. + * Fixed a bug where the "checking for updates..." window wouldn't go away if an error occurs while checking for updates. + * Made the dual-mode build configuration actually use the .xcconfig which builds it with GC support. (oops!) + * Fixed relaunching for prefpanes. + * Sparkle no longer fails to install updates on Snow Leopard (though there's still an issue with trashing the old version of the app, but it seems to be a 10.6 bug) + * Sparkle now handles redirects correctly under Tiger. + * Fixed the installation path for non-.app bundles. + * Fixed a bug which could crash Sparkle under non-English locales. + * Fixed a weird race condition which could cause the relaunch tool to never notice that its target relaunched. + * Fixed a bug where if the host app is inactive when an update occurs, the update alert sometimes doesn't become key. + * Minor textual fixes. +* Localizations: + * Dutch: Maarten Van Coile + * French: Yann Ricquebourg + * Spanish: Ernesto Gomez Cereijo + + # 1.5.0-beta1 + + * The most important things to know: + * The 10.3 support is untested at best; sketchy at worst. Test with it thoroughly before you use it. + * Sparkle now asks for permission to update on second launch; don't be surprised at that. You can change that behavior with a delegate method; read SUUpdater.h for more info. + * We no longer distinguish between "check on startup" and "scheduled updates"; everything is scheduled, with the default being every day. + * The test application is using the new profiling features, but that's only for demonstration: these are off by default. More on this later. + * There are no localizations yet. +* New features: + * Sparkle now supports .pkgs. Just name the .pkg the name of the app and put in the update archive. + * Sparkle now sends optional demographic profiling information; set SUEnableSystemProfiling to YES in your Info.plist and check out the GET data sent to your webserver when fetching the appcast. More on this in the documentation. The test application has this on so you can see the behavior. + * Sparkle now supports updating non-.apps. Just call -setHostBundle: on the global SUUpdater to let it know what you're trying to update. + * Sparkle now supports garbage collection in the host app. Use "Sparkle-with-GC.framework" for that, but be aware it's 10.5-only. + * Sparkle is now 64-bit compatible, compiling both ppc64 and x86_64. + * Sparkle now supports a sparkle:minimumSystemVersion key you can set on appcast items. It does what you think it does. + * Sparkle now checks to see if the host app is running from a disk image and refuses to update if it is. (10.4+ only) + * Added support for entities in enclosure paths. + * The file size output is now formatted prettily. + * Sparkle now gives visual indication that it's checking for updates when the update's user initiated. ie: it pops up a status controller saying "checking for updates..." + * Added support for an SUPublicDSAKeyFile, so people don't have to copy/paste their entire key into their Info.plist. Set this key in your Info.plist to the filename of the key in your Resources directory. + * Added an actually maintainable codebase. +* Changes: + * Sparkle version comparison is now dramatically less stupid and verified by a bunch of unit tests. If something doesn't work the way you think it should, add a test to SUVersionComparisonTest.m + * Added a minimum to the check interval so that developers don't accidentally release their apps into the wild with 60-second test check intervals and have DOS-attack-like results. It's an hour now for release mode; feel free to change it. + * The relaunching process now uses a separate helper app, which is a much more robust method. + * Changed CFBundleShortVersionString behavior: Sparkle no longer uses Apple's about box style of displaying ShortVersionString (CFBundleVersion) when the latter is available. + * No more MD5 checking. Use DSA: it's actually secure. + * The abomination that was SUStatusChecker is dead. Use SUProbingUpdateDriver instead. +* Bugfixes: + * Fixed a huge bug with fully-automatic updating: before, if the user chose to relaunch later, the app would be running from the trash for a while. Now the buttons are "install and relaunch" or "install later." + * Sparkle forces Spotlight to reindex the updated app so that it won't keep pointing to the one in the trash. + * Sparkle trims whitespace from around DSA signatures; this could cause crashes before. + * Fixed a bug where the user choosing to skip a version would inhibit future automatic updates until the next launch. + * Fixed a bug that could occur when the app has a localized CFBundleName. + * .dmgs now work on Leopard. + * The status controller's button now sizes appropriately to the localization. + * Sparkle now works correctly with LSUIElement apps: it focuses them before displaying the update alert. + * Sparkle now deletes failed partial downloads. + * The update alert no longer floats above everything in the app. + * Fixed varied and sundry memory leaks. +* A ton of other things that I've forgotten or were too small to mention! + +# 1.1 + +* Optimized framework size: now only 1.4mb with all localizations and 384kb with only English (an English-only version is in the Extras folder). +* Added a new SUStatusChecker class for programmatically determining if a new version is available (see the docs); thanks, Evan Schoenberg! +* Added support for apps using SIGCHLD; thanks, Augie Fackler! +* Added a zh_CN update from JT Lee +* Added a Polish update from Piotr Chylinski +* Fixed DMG support for images with /Applications symlinks. +* Fixed a really stupid interval-checking bug that could cause repeated hits to the appcast. +* Fixed a bug where the check interval would be inconsistent if a value of 0 was stored in the user defaults. + +# 1.0 + +* Additions: + * Added real version comparison courtesy Kevin Ballard: Sparkle now knows that 0.89 < 1.0a3 < 1.0. + * Added many localizations courtesy David Kocher's localization team. + * Added a much better installation mechanism courtesy Allan Odgaard. + * Added a user agent string to the RSS fetch request. + * Added support for CFBundleShortVersionString in addition to CFBundleVersion, and support for a sparkle:shortVersionString attribute on the enclosure. + * Added support for CFBundleDisplayName if available. +* Changes: + * Automatic updating is now allowed by default, but only if DSA signing is on. + * Pressing Escape or closing the update alert now reminds the user later. + * Now when there's a stored check interval, Sparkle doesn't check immediately on startup the first time the app is launched because the user hasn't consented to it yet. + * The update alert now remembers its size and floats. +* Bug Fixes: + * Fixed installation of DMGs with multiple files enclosed. + * Fixed a nasty memory leak. + * Fixed a bug wherein having no value for allowing automatic updates would display a checkbox for the updates but would not honor it. + * Fixed a bug in zip extraction that occurred in Panther. + * Fixed release notes caching. + * Fixed a bug wherein Sparkle refused to authenticate the installation if the user had cancelled authentication previously in that session. + * Fixed a weird bug that would cause a second help menu to appear on first launch. + * Fixed a bug that could occur when changing the scheduled check interval. + * Fixed a bug wherein the host app could crash if the user clicked Remind Me Later before the release notes finished loading. + * Fixed a bug wherein the behavior was undefined if the user manually initiated a check when an automatic one was already taking place. + * Fixed wrapping on the description field in the update alert. + +# 1.0-beta3 + +* Fixed a nasty crasher that occurred often when the user was not connected to the internet. + +# 1.0-beta2 + +* Major Improvements: + * Fully automatic updating! (see the Documentation: this is beta and off by default) + * Added support for DSA signatures (see the Documentation). + * Added support for MD5 sum verification. + * Added Security.framework-based authentication for installing to privileged directories. + * Huge refactoring of the codebase: there's now a Sparkle Xcode project, Sparkle is now a framework, and everything is modular / abstracted. And no more code-generated interface. +* Minor Improvements: + * A SUUpdaterWillRestartNotification is sent out before restarting now. + * Added key equivalents to alert panel buttons. + * Error handling is much prettier now: technical messages are not presented to the user anymore. + * There's now a test app for developers to see what Sparkle's like before using it. + * Wrote new, pretty, extremely thorough documentation. +* Bug Fixes: + * Relaunch behavior is much improved and shouldn't fail in huge apps anymore. + * Fixed a bug wherein a failing tar command could crash the host app. + * Sparkle now looks at InfoPlist.strings in addition to Info.plist. + * Fixed some stupid typos. + +# 1.0-beta1 + +* Major New Features: + * Sparkle now supports scheduled periodic updates—read the Readme for information on how to use it. + * Sparkle now supports WebKit-based release notes (for CSS and full HTML), which it displays in the main update alert, not a separate panel. The Readme has much more information. Sparkle will, of course, fall back on NSTextView if the host app does not include WebKit. +* Minor New Features: + * Added support for .zip update archives. + * Added support for .dmg update archives. + * Implemented Remind Me Later to replace simple update cancellation. + * Implemented Skip This Version functionality. + * Added support for multiple feeds via the user defaults SUFeedURL key taking precedent over the one in Info.plist. + * Added support for Sparkle's custom XML namespace, which is optional but may prove useful. See the Readme for more information. +* Bug Fixes: + * Sparkle will no longer enter an inconsistent state if the user tries to update again while one is already in progress. + * Sparkle now uses CFBundleName to determine the application's name instead of the app's filename. + * Sparkle no longer crashes if the user cancels during extraction. + * Lots of code refactoring. + +# 0.1 + +* Initial Release diff --git a/Frameworks/Sparkle/Configurations/ConfigBinaryDelta.xcconfig b/Frameworks/Sparkle/Configurations/ConfigBinaryDelta.xcconfig index 2f84a51ed..6d2095245 100644 --- a/Frameworks/Sparkle/Configurations/ConfigBinaryDelta.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigBinaryDelta.xcconfig @@ -2,7 +2,3 @@ PRODUCT_NAME = BinaryDelta GCC_PREFIX_HEADER = -MACOSX_DEPLOYMENT_TARGET[arch=i386] = 10.5 -MACOSX_DEPLOYMENT_TARGET[arch=ppc64] = 10.5 -MACOSX_DEPLOYMENT_TARGET[arch=ppc] = 10.5 -MACOSX_DEPLOYMENT_TARGET[arch=x86_64] = 10.5 diff --git a/Frameworks/Sparkle/Configurations/ConfigBinaryDeltaDebug.xcconfig b/Frameworks/Sparkle/Configurations/ConfigBinaryDeltaDebug.xcconfig index cd893a71e..3be980b11 100644 --- a/Frameworks/Sparkle/Configurations/ConfigBinaryDeltaDebug.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigBinaryDeltaDebug.xcconfig @@ -1,5 +1,2 @@ -#include "ConfigCommon.xcconfig" -#include "ConfigCommonDebug.xcconfig" #include "ConfigBinaryDelta.xcconfig" -OTHER_CFLAGS = -DDEBUG diff --git a/Frameworks/Sparkle/Configurations/ConfigBinaryDeltaRelease.xcconfig b/Frameworks/Sparkle/Configurations/ConfigBinaryDeltaRelease.xcconfig index cb4622597..3e22baaab 100644 --- a/Frameworks/Sparkle/Configurations/ConfigBinaryDeltaRelease.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigBinaryDeltaRelease.xcconfig @@ -1,3 +1 @@ -#include "ConfigCommon.xcconfig" -#include "ConfigCommonRelease.xcconfig" #include "ConfigBinaryDelta.xcconfig" diff --git a/Frameworks/Sparkle/Configurations/ConfigCommon.xcconfig b/Frameworks/Sparkle/Configurations/ConfigCommon.xcconfig index a1c0b5400..a5c5fbfc8 100644 --- a/Frameworks/Sparkle/Configurations/ConfigCommon.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigCommon.xcconfig @@ -1,51 +1,62 @@ // Common -PREBINDING = NO -ZERO_LINK = NO -CURRENT_PROJECT_VERSION = 1.5 -SDKROOT = macosx10.7 -MACOSX_DEPLOYMENT_TARGET[arch=ppc] = 10.4 -MACOSX_DEPLOYMENT_TARGET[arch=ppc64] = 10.5 -MACOSX_DEPLOYMENT_TARGET[arch=i386] = 10.4 -MACOSX_DEPLOYMENT_TARGET[arch=x86_64] = 10.5 -GCC_C_LANGUAGE_STANDARD = c99 -GCC_ENABLE_OBJC_EXCEPTIONS = YES -GCC_DEBUGGING_SYMBOLS = full +FINISH_INSTALL_TOOL_NAME = Autoupdate + +SPARKLE_VERSION_MAJOR = 1 +SPARKLE_VERSION_MINOR = 8 +SPARKLE_VERSION_PATCH = 0 +SPARKLE_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH) + +CURRENT_PROJECT_VERSION = $(SPARKLE_VERSION) +ALWAYS_SEARCH_USER_PATHS = NO GCC_PRECOMPILE_PREFIX_HEADER = YES GCC_PREFIX_HEADER = $(SDKROOT)/System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h -GCC_FAST_OBJC_DISPATCH = YES -GCC_ENABLE_PASCAL_STRINGS = NO -ARCHS = ppc i386 x86_64 -GCC_VERSION = com.apple.compilers.llvm.clang.1_0 -CLANG_LINK_OBJC_RUNTIME = NO +ARCHS = $(ARCHS_STANDARD) +MACOSX_DEPLOYMENT_TARGET = 10.7 + +GCC_PREPROCESSOR_DEFINITIONS = FINISH_INSTALL_TOOL_NAME=$(FINISH_INSTALL_TOOL_NAME) +CLANG_ENABLE_OBJC_ARC = YES // Enable warnings -GCC_WARN_CHECK_SWITCH_STATEMENTS = YES -GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = YES -GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES -GCC_WARN_SHADOW = YES +CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES +CLANG_WARN_DOCUMENTATION_COMMENTS = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES +CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES +CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES +CLANG_WARN_OBJC_RECEIVER_WEAK = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES GCC_WARN_64_TO_32_BIT_CONVERSION = YES -GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = YES -GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES -GCC_WARN_ABOUT_RETURN_TYPE = YES -GCC_WARN_MISSING_PARENTHESES = YES +GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES GCC_WARN_ABOUT_MISSING_NEWLINE = YES -GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES -GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES -GCC_WARN_ABOUT_POINTER_SIGNEDNESS = YES -GCC_WARN_SIGN_COMPARE = YES -GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES -GCC_WARN_UNKNOWN_PRAGMAS = YES -GCC_WARN_UNUSED_VARIABLE = YES -GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES -GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = YES GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES +GCC_WARN_ABOUT_RETURN_TYPE = YES +GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES -GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = YES +GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES +GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES +GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = YES +GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES +GCC_WARN_PEDANTIC = YES +GCC_WARN_SHADOW = YES +GCC_WARN_SIGN_COMPARE = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +GCC_WARN_UNKNOWN_PRAGMAS = YES GCC_WARN_UNUSED_FUNCTION = YES GCC_WARN_UNUSED_LABEL = YES -GCC_WARN_UNUSED_VALUE = YES GCC_WARN_UNUSED_PARAMETER = YES -GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES -GCC_WARN_UNDECLARED_SELECTOR = YES -WARNING_CFLAGS = -Wall -Wno-unused-parameter -Werror -Wundef -Wendif-labels -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-format-attribute -Wpacked -Wredundant-decls -Winline -Wdisabled-optimization -Winvalid-pch +GCC_WARN_UNUSED_VARIABLE = YES + +// These should be removed once the conversion to ARC is complete +WARNING_CFLAGS_EXTRA = -Wno-custom-atomic-properties -Wno-implicit-atomic-properties + +// Turn on all warnings, then disable a few which are almost impossible to avoid +WARNING_CFLAGS = -Wall -Weverything -Wno-empty-translation-unit -Wno-unused-macros -Wno-gnu-statement-expression -Wno-receiver-is-weak -Wno-arc-repeated-use-of-weak $(WARNING_CFLAGS_EXTRA) diff --git a/Frameworks/Sparkle/Configurations/ConfigCommonDebug.xcconfig b/Frameworks/Sparkle/Configurations/ConfigCommonDebug.xcconfig index 36003c984..90332131e 100644 --- a/Frameworks/Sparkle/Configurations/ConfigCommonDebug.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigCommonDebug.xcconfig @@ -1,10 +1,11 @@ +#include "ConfigCommon.xcconfig" + // Debug only GCC_OPTIMIZATION_LEVEL = 0 DEBUG_INFORMATION_FORMAT = dwarf GCC_GENERATE_DEBUGGING_SYMBOLS = YES -SPARKLE_EXTRA_DEBUG_10_5_ONLY = -fstack-protector -D_FORTIFY_SOURCE=2 SPARKLE_EXTRA_DEBUG = -DDEBUG OTHER_CFLAGS = $(SPARKLE_EXTRA_DEBUG) - -// Add $(SPARKLE_EXTRA_DEBUG_10_5_ONLY) to SPARKLE_EXTRA_DEBUG if your deployment is 10.5 or greater. \ No newline at end of file +ONLY_ACTIVE_ARCH = YES +COPY_PHASE_STRIP = NO diff --git a/Frameworks/Sparkle/Configurations/ConfigCommonRelease.xcconfig b/Frameworks/Sparkle/Configurations/ConfigCommonRelease.xcconfig index 19e098666..acffc466a 100644 --- a/Frameworks/Sparkle/Configurations/ConfigCommonRelease.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigCommonRelease.xcconfig @@ -1,8 +1,10 @@ +#include "ConfigCommon.xcconfig" + // Release only GCC_OPTIMIZATION_LEVEL = s DEBUG_INFORMATION_FORMAT = dwarf-with-dsym -GCC_GENERATE_DEBUGGING_SYMBOLS = NO +GCC_GENERATE_DEBUGGING_SYMBOLS = YES DEAD_CODE_STRIPPING = YES -GCC_TREAT_WARNINGS_AS_ERRORS = YES +GCC_TREAT_WARNINGS_AS_ERRORS = NO GCC_WARN_UNINITIALIZED_AUTOS = YES diff --git a/Frameworks/Sparkle/Configurations/ConfigFramework.xcconfig b/Frameworks/Sparkle/Configurations/ConfigFramework.xcconfig index c1bb20819..a0528768d 100644 --- a/Frameworks/Sparkle/Configurations/ConfigFramework.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigFramework.xcconfig @@ -1,10 +1,12 @@ // Framework only INSTALL_PATH = @loader_path/../Frameworks -DYLIB_COMPATIBILITY_VERSION = 1.5 -DYLIB_CURRENT_VERSION = 1.5 +DYLIB_COMPATIBILITY_VERSION = 1.6 +DYLIB_CURRENT_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH) PRODUCT_NAME = Sparkle WRAPPER_EXTENSION = framework FRAMEWORK_VERSION = A -INFOPLIST_FILE = Info.plist -GCC_PREFIX_HEADER = Sparkle.pch +INFOPLIST_FILE = Sparkle/Sparkle-Info.plist +GCC_PREFIX_HEADER = Sparkle/Sparkle.pch +SKIP_INSTALL = YES +OTHER_LDFLAGS = -Wl,-U,_NSURLQuarantinePropertiesKey diff --git a/Frameworks/Sparkle/Configurations/ConfigFrameworkDebug.xcconfig b/Frameworks/Sparkle/Configurations/ConfigFrameworkDebug.xcconfig index e256c4907..58d6b5aa6 100644 --- a/Frameworks/Sparkle/Configurations/ConfigFrameworkDebug.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigFrameworkDebug.xcconfig @@ -1,5 +1,2 @@ -#include "ConfigCommon.xcconfig" -#include "ConfigCommonDebug.xcconfig" #include "ConfigFramework.xcconfig" -OTHER_CFLAGS = -DDEBUG diff --git a/Frameworks/Sparkle/Configurations/ConfigFrameworkRelease.xcconfig b/Frameworks/Sparkle/Configurations/ConfigFrameworkRelease.xcconfig index b82656099..58d6b5aa6 100644 --- a/Frameworks/Sparkle/Configurations/ConfigFrameworkRelease.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigFrameworkRelease.xcconfig @@ -1,9 +1,2 @@ -#include "ConfigCommon.xcconfig" -#include "ConfigCommonRelease.xcconfig" #include "ConfigFramework.xcconfig" -STRIP_INSTALLED_PRODUCT = YES -DEPLOYMENT_POSTPROCESSING = YES -STRIPFLAGS = -u -r -STRIP_STYLE = non-global -SEPARATE_STRIP = YES diff --git a/Frameworks/Sparkle/Configurations/ConfigRelaunch.xcconfig b/Frameworks/Sparkle/Configurations/ConfigRelaunch.xcconfig index dc86e1685..ee339f012 100644 --- a/Frameworks/Sparkle/Configurations/ConfigRelaunch.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigRelaunch.xcconfig @@ -1,4 +1,8 @@ // Relaunch Tool only -PRODUCT_NAME = finish_installation +INFOPLIST_FILE = Sparkle/Autoupdate/Autoupdate-Info.plist +PRODUCT_NAME = $(FINISH_INSTALL_TOOL_NAME) SKIP_INSTALL = YES +GCC_PREFIX_HEADER = Sparkle/Autoupdate/Autoupdate.pch +ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon +OTHER_LDFLAGS = -Wl,-U,_NSURLQuarantinePropertiesKey diff --git a/Frameworks/Sparkle/Configurations/ConfigRelaunchDebug.xcconfig b/Frameworks/Sparkle/Configurations/ConfigRelaunchDebug.xcconfig index 940941106..4ddb5d77d 100644 --- a/Frameworks/Sparkle/Configurations/ConfigRelaunchDebug.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigRelaunchDebug.xcconfig @@ -1,5 +1 @@ -#include "ConfigCommon.xcconfig" -#include "ConfigCommonDebug.xcconfig" #include "ConfigRelaunch.xcconfig" - -OTHER_CFLAGS = -DDEBUG diff --git a/Frameworks/Sparkle/Configurations/ConfigRelaunchRelease.xcconfig b/Frameworks/Sparkle/Configurations/ConfigRelaunchRelease.xcconfig index 111f2adda..4ddb5d77d 100644 --- a/Frameworks/Sparkle/Configurations/ConfigRelaunchRelease.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigRelaunchRelease.xcconfig @@ -1,3 +1 @@ -#include "ConfigCommon.xcconfig" -#include "ConfigCommonRelease.xcconfig" #include "ConfigRelaunch.xcconfig" diff --git a/Frameworks/Sparkle/Configurations/ConfigTestApp.xcconfig b/Frameworks/Sparkle/Configurations/ConfigTestApp.xcconfig index 36540ca4c..35e7e5433 100644 --- a/Frameworks/Sparkle/Configurations/ConfigTestApp.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigTestApp.xcconfig @@ -1,5 +1,7 @@ // Test Application only -INFOPLIST_FILE = Test Application/Test Application-Info.plist +INFOPLIST_FILE = TestApplication/TestApplication-Info.plist PRODUCT_NAME = Sparkle Test App WRAPPER_EXTENSION = app +ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon +CLANG_ENABLE_OBJC_ARC = NO diff --git a/Frameworks/Sparkle/Configurations/ConfigTestAppDebug.xcconfig b/Frameworks/Sparkle/Configurations/ConfigTestAppDebug.xcconfig index 9833128ee..476c0f07a 100644 --- a/Frameworks/Sparkle/Configurations/ConfigTestAppDebug.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigTestAppDebug.xcconfig @@ -1,5 +1,2 @@ -#include "ConfigCommon.xcconfig" -#include "ConfigCommonDebug.xcconfig" #include "ConfigTestApp.xcconfig" -OTHER_CFLAGS = -DDEBUG diff --git a/Frameworks/Sparkle/Configurations/ConfigTestAppRelease.xcconfig b/Frameworks/Sparkle/Configurations/ConfigTestAppRelease.xcconfig index 48143e3fa..de0d28023 100644 --- a/Frameworks/Sparkle/Configurations/ConfigTestAppRelease.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigTestAppRelease.xcconfig @@ -1,3 +1 @@ -#include "ConfigCommon.xcconfig" -#include "ConfigCommonRelease.xcconfig" #include "ConfigTestApp.xcconfig" diff --git a/Frameworks/Sparkle/Configurations/ConfigUnitTest.xcconfig b/Frameworks/Sparkle/Configurations/ConfigUnitTest.xcconfig index ee0fe2057..baaf48201 100644 --- a/Frameworks/Sparkle/Configurations/ConfigUnitTest.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigUnitTest.xcconfig @@ -1,10 +1,6 @@ // Unit Test only -INFOPLIST_FILE = Tests/Sparkle Unit Tests-Info.plist -OTHER_LDFLAGS = -framework Cocoa -framework SenTestingKit +INFOPLIST_FILE = Tests/SparkleTests-Info.plist PRODUCT_NAME = Sparkle Unit Tests -WRAPPER_EXTENSION = octest -FRAMEWORK_SEARCH_PATHS = $(DEVELOPER_LIBRARY_DIR)/Frameworks -GCC_PREFIX_HEADER = $(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h -GCC_PRECOMPILE_PREFIX_HEADER = YES -MACOSX_DEPLOYMENT_TARGET = 10.6 +WRAPPER_EXTENSION = xctest +WARNING_CFLAGS = $(inherited) -Wno-variadic-macros -Wno-gnu-zero-variadic-macro-arguments diff --git a/Frameworks/Sparkle/Configurations/ConfigUnitTestDebug.xcconfig b/Frameworks/Sparkle/Configurations/ConfigUnitTestDebug.xcconfig index 354e9361c..e2481b5e4 100644 --- a/Frameworks/Sparkle/Configurations/ConfigUnitTestDebug.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigUnitTestDebug.xcconfig @@ -1,3 +1 @@ -#include "ConfigCommon.xcconfig" -#include "ConfigCommonDebug.xcconfig" #include "ConfigUnitTest.xcconfig" diff --git a/Frameworks/Sparkle/Configurations/ConfigUnitTestRelease.xcconfig b/Frameworks/Sparkle/Configurations/ConfigUnitTestRelease.xcconfig index 53dd6b93a..e2481b5e4 100644 --- a/Frameworks/Sparkle/Configurations/ConfigUnitTestRelease.xcconfig +++ b/Frameworks/Sparkle/Configurations/ConfigUnitTestRelease.xcconfig @@ -1,3 +1 @@ -#include "ConfigCommon.xcconfig" -#include "ConfigCommonRelease.xcconfig" #include "ConfigUnitTest.xcconfig" diff --git a/Frameworks/Sparkle/Configurations/make-release-package.sh b/Frameworks/Sparkle/Configurations/make-release-package.sh new file mode 100755 index 000000000..de8001c47 --- /dev/null +++ b/Frameworks/Sparkle/Configurations/make-release-package.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -e + +if [ "$ACTION" = "" ] ; then + rm -rf "$CONFIGURATION_BUILD_DIR/staging" + rm -f "Sparkle-$CURRENT_PROJECT_VERSION.tar.bz2" + + mkdir -p "$CONFIGURATION_BUILD_DIR/staging" + cp "$SRCROOT/CHANGELOG" "$SRCROOT/LICENSE" "$SRCROOT/Resources/SampleAppcast.xml" "$CONFIGURATION_BUILD_DIR/staging" + cp -R "$SRCROOT/bin" "$CONFIGURATION_BUILD_DIR/staging" + cp "$CONFIGURATION_BUILD_DIR/BinaryDelta" "$CONFIGURATION_BUILD_DIR/staging/bin" + cp -R "$CONFIGURATION_BUILD_DIR/BinaryDelta.dSYM" "$CONFIGURATION_BUILD_DIR/staging/bin" + cp -R "$CONFIGURATION_BUILD_DIR/Sparkle Test App.app" "$CONFIGURATION_BUILD_DIR/staging" + cp -R "$CONFIGURATION_BUILD_DIR/Sparkle Test App.app.dSYM" "$CONFIGURATION_BUILD_DIR/staging" + cp -R "$CONFIGURATION_BUILD_DIR/Sparkle.framework" "$CONFIGURATION_BUILD_DIR/staging" + cp -R "$CONFIGURATION_BUILD_DIR/Sparkle.framework.dSYM" "$CONFIGURATION_BUILD_DIR/staging" + + cd "$CONFIGURATION_BUILD_DIR/staging" + # Sorted file list groups similar files together, which improves tar compression + find . \! -type d | rev | sort | rev | tar cjvf "../Sparkle-$CURRENT_PROJECT_VERSION.tar.bz2" --files-from=- + rm -rf "$CONFIGURATION_BUILD_DIR/staging" +fi diff --git a/Frameworks/Sparkle/Documentation/.gitignore b/Frameworks/Sparkle/Documentation/.gitignore new file mode 100644 index 000000000..1936cc1d4 --- /dev/null +++ b/Frameworks/Sparkle/Documentation/.gitignore @@ -0,0 +1 @@ +html diff --git a/Frameworks/Sparkle/Documentation/Doxyfile b/Frameworks/Sparkle/Documentation/Doxyfile new file mode 100644 index 000000000..a2d21a3ee --- /dev/null +++ b/Frameworks/Sparkle/Documentation/Doxyfile @@ -0,0 +1,20 @@ +PROJECT_NAME = Sparkle +PROJECT_NUMBER = 1.7.1 +PROJECT_BRIEF = "A software update framework for OS X" +PROJECT_LOGO = Resources/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png + +RECURSIVE = YES +INPUT = Sparkle +OUTPUT_DIRECTORY = Documentation + +GENERATE_HTML = YES +GENERATE_LATEX = NO + +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST = YES +GENERATE_TODOLIST = YES + +ALPHABETICAL_INDEX = YES + +QT_AUTOBRIEF = YES +WARN_IF_UNDOCUMENTED = NO diff --git a/Frameworks/Sparkle/Documentation/build-docs.sh b/Frameworks/Sparkle/Documentation/build-docs.sh new file mode 100755 index 000000000..44b43bf4f --- /dev/null +++ b/Frameworks/Sparkle/Documentation/build-docs.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +if [ "$ACTION" = "" ] ; then + if which -s doxygen ; then + doxygen Documentation/Doxyfile + else + echo "warning: Doxygen not found in PATH" + fi +elif [ "$ACTION" = "clean" ] ; then + rm -rf "$SRCROOT/Documentation/html" +fi diff --git a/Frameworks/Sparkle/LICENSE b/Frameworks/Sparkle/LICENSE new file mode 100644 index 000000000..63f898704 --- /dev/null +++ b/Frameworks/Sparkle/LICENSE @@ -0,0 +1,54 @@ +© 2006-2013 Andy Matuschak +© 2009-2013 Elgato Systems GmbH. +© 2011-2014 Kornel Lesiński +© 2014 C.W. Betts +© 2014 Petroules Corporation, Sparkle Project contributors +© 2014 Big Nerd Ranch +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +================= +EXTERNAL LICENSES +================= + +bspatch.c and bsdiff.c, from bsdiff 4.3 : © 2003-2005 Colin Percival. +SUDSAVerifier.m: © 2011 Mark Hamlin. + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted providing that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/Frameworks/Sparkle/Makefile b/Frameworks/Sparkle/Makefile index a756e3446..3e85f3958 100644 --- a/Frameworks/Sparkle/Makefile +++ b/Frameworks/Sparkle/Makefile @@ -1,7 +1,21 @@ -.PHONY: all localizable-strings +.PHONY: all localizable-strings release build test travis + +BUILDDIR := $(shell mktemp -d "$(TMPDIR)/Sparkle.XXXXXX") localizable-strings: - rm en.lproj/Sparkle.strings || TRUE - genstrings -o en.lproj -s SULocalizedString *.m *.h - mv en.lproj/Localizable.strings en.lproj/Sparkle.strings + rm -f Sparkle/en.lproj/Sparkle.strings + genstrings -o Sparkle/en.lproj -s SULocalizedString Sparkle/*.m Sparkle/*.h + iconv -f UTF-16 -t UTF-8 < Sparkle/en.lproj/Localizable.strings > Sparkle/en.lproj/Sparkle.strings + rm Sparkle/en.lproj/Localizable.strings +release: + xcodebuild -scheme Distribution -configuration Release -derivedDataPath "$(BUILDDIR)" + open -R "$(BUILDDIR)/Build/Products/Release/Sparkle-"*.tar.bz2 + +build: + xcodebuild clean build + +test: + xcodebuild -target 'Sparkle Unit Tests' -scheme 'Sparkle' test + +travis: test diff --git a/Frameworks/Sparkle/README.markdown b/Frameworks/Sparkle/README.markdown index 020148098..b73d22eba 100644 --- a/Frameworks/Sparkle/README.markdown +++ b/Frameworks/Sparkle/README.markdown @@ -1,40 +1,30 @@ -# Sparkle +# Sparkle is an easy-to-use software update framework for Cocoa developers. -* True self-updating--no work required from the user. +[![Build Status](https://travis-ci.org/sparkle-project/Sparkle.svg?branch=master)](https://travis-ci.org/sparkle-project/Sparkle) -* Displays release notes to the user via WebKit. +## Changes since 1.5b +* Up-to-date with 10.10 SDK and Xcode 6. Supports OS X 10.7+. +* Cleaned up and modernized code, using ARC and Autolayout. +* Merged bugfixes, security fixes and some features from multiple Sparkle forks. +* Truly automatic background updates (no UI at all) when user agreed to "Automatically download and install updates in the future." +* Ability to mark updates as critical. +* Progress and status notifications for the host app. +* Name of finish_installation.app can be configured to match your app's name. + +## Features + +* True self-updating—the user can choose to automatically download and install all updates. * Displays a detailed progress window to the user. - * Supports authentication for installing in secure locations. - -* Really, really easy to install. - -* Uses appcasts for release information. - -* The user can choose to automatically download and install all updates. - -* Seamless integration—there's no mention of Sparkle; your icons and app name are used. - -* Supports DSA signatures for ultra-secure updates. - -* Sparkle requires no code in your app, so it's trivial to upgrade or remove the module. - -## New in Sparkle 1.5: - -* Optionally sends user demographic information to the server when checking for updates. - -* Dual-mode garbage collection support for any memory management style. - +* Supports Apple code signing and DSA signatures for ultra-secure updates. +* Easy to install. Sparkle requires no code in your app, so it's trivial to upgrade or remove the framework. +* Uses appcasts for release information. Appcasts are supported by 3rd party update-tracking programs and websites. +* Displays release notes to the user via WebKit. * Sparkle doesn't bug the user until second launch for better first impressions. - -* Sparkle can install .pkg files for more complicated products. - -* Supports bundles, preference panes, plugins, and other non-.app software. - -* Supports branches due to minimum OS version requirements. - +* Seamless integration—there's no mention of Sparkle; your icons and app name are used. * Deep delegate support to make Sparkle work exactly as you need. - -* Tons of other stuff! [Read more about what's new.](http://andymatuschak.org/articles/2008/05/31/sparkle-15b1-now-available/ "Sparkle 1.5b1: now available!") \ No newline at end of file +* Optionally sends system information to the server when checking for updates. +* Supports bundles, preference panes, plugins, and other non-.app software. Can install .pkg files for more complicated products. +* Supports branches due to minimum OS version requirements. diff --git a/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/Contents.json b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..5ddf68b46 --- /dev/null +++ b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,65 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "icon_16x16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "icon_16x16@2x.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "icon_32x32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "icon_32x32@2x.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "icon_128x128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "icon_128x128@2x.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "icon_256x256.png", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "256x256", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "512x512", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "512x512", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_128x128.png b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_128x128.png new file mode 100644 index 000000000..cab9bc5ae Binary files /dev/null and b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_128x128.png differ diff --git a/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png new file mode 100644 index 000000000..ea89c0608 Binary files /dev/null and b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png differ diff --git a/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_16x16.png b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_16x16.png new file mode 100644 index 000000000..dea3255ce Binary files /dev/null and b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_16x16.png differ diff --git a/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png new file mode 100644 index 000000000..0e7f543e3 Binary files /dev/null and b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png differ diff --git a/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_256x256.png b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_256x256.png new file mode 100644 index 000000000..b4a17b8d0 Binary files /dev/null and b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_256x256.png differ diff --git a/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_32x32.png b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_32x32.png new file mode 100644 index 000000000..77e8fde55 Binary files /dev/null and b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_32x32.png differ diff --git a/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png new file mode 100644 index 000000000..a3f6f7890 Binary files /dev/null and b/Frameworks/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png differ diff --git a/Frameworks/Sparkle/Resources/SUModelTranslation.plist b/Frameworks/Sparkle/Resources/SUModelTranslation.plist new file mode 100644 index 000000000..74db0ff07 --- /dev/null +++ b/Frameworks/Sparkle/Resources/SUModelTranslation.plist @@ -0,0 +1,228 @@ + + + + + ADP2,1 + Developer Transition Kit + iMac1,1 + iMac G3 (Rev A-D) + iMac4,1 + iMac (Core Duo) + iMac4,2 + iMac for Education (17 inch, Core Duo) + iMac5,1 + iMac (Core 2 Duo, 17 or 20 inch, SuperDrive) + iMac5,2 + iMac (Core 2 Duo, 17 inch, Combo Drive) + iMac6,1 + iMac (Core 2 Duo, 24 inch, SuperDrive) + iMac8,1 + iMac (Core 2 Duo, 20 or 24 inch, Early 2008 ) + iMac9,1 + iMac (Core 2 Duo, 20 or 24 inch, Early or Mid 2009 ) + iMac10,1 + iMac (Core 2 Duo, 21.5 or 27 inch, Late 2009 ) + iMac11,1 + iMac (Core i5 or i7, 27 inch Late 2009) + iMac11,2 + iMac (Core i3 or i5, 27 inch Mid 2010) + iMac11,3 + iMac (Core i5 or i7, 27 inch Mid 2010) + iMac12,1 + iMac (Core i3 or i5 or i7, 21.5 inch Mid 2010 or Late 2011) + iMac12,2 + iMac (Core i5 or i7, 27 inch Mid 2011) + iMac13,1 + iMac (Core i3 or i5 or i7, 21.5 inch Late 2012 or Early 2013) + iMac13,2 + iMac (Core i5 or i7, 27 inch Late 2012) + iMac14,1 + iMac (Core i5, 21.5 inch Late 2013) + iMac14,2 + iMac (Core i5 or i7, 27 inch Late 2013) + iMac14,3 + iMac (Core i5 or i7, 21.5 inch Late 2013) + MacBook1,1 + MacBook (Core Duo) + MacBook2,1 + MacBook (Core 2 Duo) + MacBook4,1 + MacBook (Core 2 Duo Feb 2008) + MacBook5,1 + MacBook (Core 2 Duo, Late 2008, Unibody) + MacBook5,2 + MacBook (Core 2 Duo, Early 2009, White) + MacBook6,1 + MacBook (Core 2 Duo, Late 2009, Unibody) + MacBook7,1 + MacBook (Core 2 Duo, Mid 2010, White) + MacBookAir1,1 + MacBook Air (Core 2 Duo, 13 inch, Early 2008) + MacBookAir2,1 + MacBook Air (Core 2 Duo, 13 inch, Mid 2009) + MacBookAir3,1 + MacBook Air (Core 2 Duo, 11 inch, Late 2010) + MacBookAir3,2 + MacBook Air (Core 2 Duo, 13 inch, Late 2010) + MacBookAir4,1 + MacBook Air (Core i5 or i7, 11 inch, Mid 2011) + MacBookAir4,2 + MacBook Air (Core i5 or i7, 13 inch, Mid 2011) + MacBookAir5,1 + MacBook Air (Core i5 or i7, 11 inch, Mid 2012) + MacBookAir5,2 + MacBook Air (Core i5 or i7, 13 inch, Mid 2012) + MacBookAir6,1 + MacBook Air (Core i5 or i7, 11 inch, Mid 2013 or Early 2014) + MacBookAir6,2 + MacBook Air (Core i5 or i7, 13 inch, Mid 2013 or Early 2014) + MacBookPro1,1 + MacBook Pro Core Duo (15-inch) + MacBookPro1,2 + MacBook Pro Core Duo (17-inch) + MacBookPro2,1 + MacBook Pro Core 2 Duo (17-inch) + MacBookPro2,2 + MacBook Pro Core 2 Duo (15-inch) + MacBookPro3,1 + MacBook Pro Core 2 Duo (15-inch LED, Core 2 Duo) + MacBookPro3,2 + MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo) + MacBookPro4,1 + MacBook Pro (Core 2 Duo Feb 2008) + Macmini1,1 + Mac Mini (Core Solo/Duo) + MacPro1,1 + Mac Pro (four-core) + MacPro2,1 + Mac Pro (eight-core) + MacPro3,1 + Mac Pro (January 2008 4- or 8- core "Harpertown") + MacPro4,1 + Mac Pro (March 2009) + MacPro5,1 + Mac Pro (August 2010) + PowerBook1,1 + PowerBook G3 + PowerBook2,1 + iBook G3 + PowerBook2,2 + iBook G3 (FireWire) + PowerBook2,3 + iBook G3 + PowerBook2,4 + iBook G3 + PowerBook3,1 + PowerBook G3 (FireWire) + PowerBook3,2 + PowerBook G4 + PowerBook3,3 + PowerBook G4 (Gigabit Ethernet) + PowerBook3,4 + PowerBook G4 (DVI) + PowerBook3,5 + PowerBook G4 (1GHz / 867MHz) + PowerBook4,1 + iBook G3 (Dual USB, Late 2001) + PowerBook4,2 + iBook G3 (16MB VRAM) + PowerBook4,3 + iBook G3 Opaque 16MB VRAM, 32MB VRAM, Early 2003) + PowerBook5,1 + PowerBook G4 (17 inch) + PowerBook5,2 + PowerBook G4 (15 inch FW 800) + PowerBook5,3 + PowerBook G4 (17-inch 1.33GHz) + PowerBook5,4 + PowerBook G4 (15 inch 1.5/1.33GHz) + PowerBook5,5 + PowerBook G4 (17-inch 1.5GHz) + PowerBook5,6 + PowerBook G4 (15 inch 1.67GHz/1.5GHz) + PowerBook5,7 + PowerBook G4 (17-inch 1.67GHz) + PowerBook5,8 + PowerBook G4 (Double layer SD, 15 inch) + PowerBook5,9 + PowerBook G4 (Double layer SD, 17 inch) + PowerBook6,1 + PowerBook G4 (12 inch) + PowerBook6,2 + PowerBook G4 (12 inch, DVI) + PowerBook6,3 + iBook G4 + PowerBook6,4 + PowerBook G4 (12 inch 1.33GHz) + PowerBook6,5 + iBook G4 (Early-Late 2004) + PowerBook6,7 + iBook G4 (Mid 2005) + PowerBook6,8 + PowerBook G4 (12 inch 1.5GHz) + PowerMac1,1 + Power Macintosh G3 (Blue & White) + PowerMac1,2 + Power Macintosh G4 (PCI Graphics) + PowerMac10,1 + Mac Mini G4 + PowerMac10,2 + Mac Mini (Late 2005) + PowerMac11,2 + Power Macintosh G5 (Late 2005) + PowerMac12,1 + iMac G5 (iSight) + PowerMac2,1 + iMac G3 (Slot-loading CD-ROM) + PowerMac2,2 + iMac G3 (Summer 2000) + PowerMac3,1 + Power Macintosh G4 (AGP Graphics) + PowerMac3,2 + Power Macintosh G4 (AGP Graphics) + PowerMac3,3 + Power Macintosh G4 (Gigabit Ethernet) + PowerMac3,4 + Power Macintosh G4 (Digital Audio) + PowerMac3,5 + Power Macintosh G4 (Quick Silver) + PowerMac3,6 + Power Macintosh G4 (Mirrored Drive Door) + PowerMac4,1 + iMac G3 (Early/Summer 2001) + PowerMac4,2 + iMac G4 (Flat Panel) + PowerMac4,4 + eMac + PowerMac4,5 + iMac G4 (17-inch Flat Panel) + PowerMac5,1 + Power Macintosh G4 Cube + PowerMac6,1 + iMac G4 (USB 2.0) + PowerMac6,3 + iMac G4 (20-inch Flat Panel) + PowerMac6,4 + eMac (USB 2.0, 2005) + PowerMac7,2 + Power Macintosh G5 + PowerMac7,3 + Power Macintosh G5 + PowerMac8,1 + iMac G5 + PowerMac8,2 + iMac G5 (Ambient Light Sensor) + PowerMac9,1 + Power Macintosh G5 (Late 2005) + RackMac1,1 + Xserve G4 + RackMac1,2 + Xserve G4 (slot-loading, cluster node) + RackMac3,1 + Xserve G5 + Xserve1,1 + Xserve (Intel Xeon) + Xserve2,1 + Xserve (January 2008 quad-core) + + diff --git a/Frameworks/Sparkle/Resources/SampleAppcast.xml b/Frameworks/Sparkle/Resources/SampleAppcast.xml new file mode 100755 index 000000000..1abb2c2cc --- /dev/null +++ b/Frameworks/Sparkle/Resources/SampleAppcast.xml @@ -0,0 +1,39 @@ + + + + Your Great App's Changelog + http://you.com/app/appcast.xml + Most recent changes with links to updates. + en + + Version 2.0 (2 bugs fixed; 3 new features) + + http://you.com/app/2.0.html + + Wed, 09 Jan 2006 19:20:11 +0000 + + 10.7 + + + + Version 1.5 (8 bugs fixed; 2 new features) + + http://you.com/app/1.5.html + + Wed, 01 Jan 2006 12:20:11 +0000 + + 10.7 + + + + + Version 1.4 (5 bugs fixed; 2 new features) + + http://you.com/app/1.4.html + + Wed, 25 Dec 2005 12:20:11 +0000 + + 10.7 + + + diff --git a/Frameworks/Sparkle/Resources/Sparkle.png b/Frameworks/Sparkle/Resources/Sparkle.png new file mode 100644 index 000000000..8ccf2e734 Binary files /dev/null and b/Frameworks/Sparkle/Resources/Sparkle.png differ diff --git a/Frameworks/Sparkle/Sparkle.podspec b/Frameworks/Sparkle/Sparkle.podspec new file mode 100644 index 000000000..9b597f242 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle.podspec @@ -0,0 +1,26 @@ +Pod::Spec.new do |s| + s.name = "Sparkle" + s.version = "1.7.1" + s.summary = "A software update framework for OS X" + s.description = "Sparkle is an easy-to-use software update framework for Cocoa developers." + s.homepage = "https://github.com/sparkle-project/Sparkle" + s.license = { + :type => 'MIT', + :file => 'LICENSE' + } + s.authors = { + 'Andy Matuschak' => 'andy@andymatuschak.org', + 'Kornel Lesiński' => 'pornel@pornel.net', + 'C.W. Betts' => 'computers57@hotmail.com', + 'Jake Petroules' => 'jake.petroules@petroules.com', + } + + s.platform = :osx + s.source = { :http => "https://github.com/sparkle-project/Sparkle/releases/download/#{s.version}/Sparkle-#{s.version}.zip" } + + s.public_header_files = 'Sparkle.framework/Headers/*.h' + s.vendored_framework = 'Sparkle.framework' + s.resources = 'Sparkle.framework' + s.xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '"${PODS_ROOT}/Sparkle"' } + s.requires_arc = false +end diff --git a/Frameworks/Sparkle/Sparkle.xcodeproj/project.pbxproj b/Frameworks/Sparkle/Sparkle.xcodeproj/project.pbxproj index 177715535..30f16159e 100644 --- a/Frameworks/Sparkle/Sparkle.xcodeproj/project.pbxproj +++ b/Frameworks/Sparkle/Sparkle.xcodeproj/project.pbxproj @@ -6,25 +6,52 @@ objectVersion = 46; objects = { +/* Begin PBXAggregateTarget section */ + 1495005F195FB89400BC5B5B /* All */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 14950060195FB89500BC5B5B /* Build configuration list for PBXAggregateTarget "All" */; + buildPhases = ( + ); + dependencies = ( + 14950064195FB8A600BC5B5B /* PBXTargetDependency */, + 14950066195FB8A600BC5B5B /* PBXTargetDependency */, + 14950068195FB8A600BC5B5B /* PBXTargetDependency */, + 1495006A195FB8A600BC5B5B /* PBXTargetDependency */, + 1495006C195FB8A600BC5B5B /* PBXTargetDependency */, + ); + name = All; + productName = All; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ + 1420DF50196247F900203BB0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1420DF4F196247F900203BB0 /* Images.xcassets */; }; + 1420DF51196247F900203BB0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1420DF4F196247F900203BB0 /* Images.xcassets */; }; + 14732BC01960F2C200593899 /* test_app_only_dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 14732BBF1960F0AC00593899 /* test_app_only_dsa_pub.pem */; }; + 14732BD019610A0D00593899 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; }; + 14732BD119610A1200593899 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; }; + 14732BD319610A1800593899 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 14732BD219610A1800593899 /* XCTest.framework */; }; + 1495006E195FCE1100BC5B5B /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; }; + 1495006F195FCE1800BC5B5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; }; + 14950070195FCE3A00BC5B5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; }; + 14950071195FCE3D00BC5B5B /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; }; + 14950072195FCE4B00BC5B5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; }; + 14950073195FCE4E00BC5B5B /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; }; + 14950075195FDF5900BC5B5B /* SUUpdaterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 14950074195FDF5900BC5B5B /* SUUpdaterTest.m */; }; 3772FEA913DE0B6B00F79537 /* SUVersionDisplayProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 3772FEA813DE0B6B00F79537 /* SUVersionDisplayProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 525A2790133D6AE900FD8D70 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 525A278F133D6AE900FD8D70 /* Cocoa.framework */; }; - 525A27A0133D6B9700FD8D70 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 525A278F133D6AE900FD8D70 /* Cocoa.framework */; }; - 550347011370023A00AE7681 /* Sparkle.icns in Resources */ = {isa = PBXBuildFile; fileRef = 550347001370023A00AE7681 /* Sparkle.icns */; }; - 55C14BD4136EEFCE00649790 /* finish_installation.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C14BD3136EEFCE00649790 /* finish_installation.m */; }; + 55C14BD4136EEFCE00649790 /* Autoupdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C14BD3136EEFCE00649790 /* Autoupdate.m */; }; 55C14BD9136EF00C00649790 /* SUStatus.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BD8136EF00C00649790 /* SUStatus.xib */; }; 55C14BEE136EF20D00649790 /* SUAutomaticUpdateAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BDA136EF20D00649790 /* SUAutomaticUpdateAlert.xib */; }; 55C14BEF136EF21700649790 /* SUStatus.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BD8136EF00C00649790 /* SUStatus.xib */; }; 55C14C04136EF26100649790 /* SUUpdateAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BF0136EF26100649790 /* SUUpdateAlert.xib */; }; 55C14C19136EF2C700649790 /* SUUpdatePermissionPrompt.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C14C05136EF2C700649790 /* SUUpdatePermissionPrompt.xib */; }; - 55C14EE8136EF61D00649790 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 525A278F133D6AE900FD8D70 /* Cocoa.framework */; }; 55C14F00136EF6B700649790 /* SUConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A5F09CA6EB100B7442F /* SUConstants.m */; }; 55C14F06136EF6DB00649790 /* SULog.h in Headers */ = {isa = PBXBuildFile; fileRef = 55C14F04136EF6DB00649790 /* SULog.h */; }; 55C14F07136EF6DB00649790 /* SULog.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C14F05136EF6DB00649790 /* SULog.m */; }; 55C14F08136EF6DB00649790 /* SULog.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C14F05136EF6DB00649790 /* SULog.m */; }; 55C14F0C136EF6EA00649790 /* SUHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EF67550E25B58D00F754E0 /* SUHost.m */; }; 55C14F0D136EF6F200649790 /* SUInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 618FA5000DAE88B40026945C /* SUInstaller.m */; }; - 55C14F0F136EF73600649790 /* finish_installation.pch in Headers */ = {isa = PBXBuildFile; fileRef = 55C14F0E136EF73600649790 /* finish_installation.pch */; }; + 55C14F0F136EF73600649790 /* Autoupdate.pch in Headers */ = {isa = PBXBuildFile; fileRef = 55C14F0E136EF73600649790 /* Autoupdate.pch */; }; 55C14F20136EF84300649790 /* SUStatusController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6196CFE409C71ADE000DC222 /* SUStatusController.m */; }; 55C14F21136EF84D00649790 /* SUPlainInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 618FA5040DAE8AB80026945C /* SUPlainInstaller.m */; }; 55C14F22136EF86000649790 /* SUStandardVersionComparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A225A30D1C4AC000430CCD /* SUStandardVersionComparator.m */; }; @@ -32,14 +59,15 @@ 55C14F24136EF86F00649790 /* SUPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 618FA5210DAE8E8A0026945C /* SUPackageInstaller.m */; }; 55C14F2A136EF9A900649790 /* SUWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61180BC90D64138900B4E0D1 /* SUWindowController.m */; }; 55C14F32136EFC2400649790 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55C14F31136EFC2400649790 /* SystemConfiguration.framework */; }; - 55C14F3B136EFCB300649790 /* finish_installation.app in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BB7136EEF1500649790 /* finish_installation.app */; }; + 55C14F3B136EFCB300649790 /* Autoupdate.app in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BB7136EEF1500649790 /* Autoupdate.app */; }; 55C14F7E136F005000649790 /* SUPlainInstallerInternals.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5F8E509C4CE3C00B25A18 /* SUPlainInstallerInternals.m */; }; 55C14F9A136F045400649790 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B5F8F609C4CEB300B25A18 /* Security.framework */; }; 55C14FC7136F05E100649790 /* Sparkle.strings in Resources */ = {isa = PBXBuildFile; fileRef = 61AAE8220A321A7F00D8810D /* Sparkle.strings */; }; + 5AF9DC3C1981DBEE001EA135 /* SUDSAVerifierTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AF9DC3B1981DBEE001EA135 /* SUDSAVerifierTest.m */; }; 5D06E8D80FD68C8E005AE3F6 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; }; - 5D06E8E90FD68CDB005AE3F6 /* bsdiff.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D06E8DB0FD68CB9005AE3F6 /* bsdiff.c */; settings = {COMPILER_FLAGS = "-Wno-shorten-64-to-32"; }; }; + 5D06E8E90FD68CDB005AE3F6 /* bsdiff.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D06E8DB0FD68CB9005AE3F6 /* bsdiff.c */; settings = {COMPILER_FLAGS = "-w"; }; }; 5D06E8EA0FD68CDB005AE3F6 /* SUBinaryDeltaTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D06E8E30FD68CC7005AE3F6 /* SUBinaryDeltaTool.m */; }; - 5D06E8EB0FD68CE4005AE3F6 /* bspatch.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D06E8DC0FD68CB9005AE3F6 /* bspatch.c */; settings = {COMPILER_FLAGS = "-Wno-shorten-64-to-32"; }; }; + 5D06E8EB0FD68CE4005AE3F6 /* bspatch.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D06E8DC0FD68CB9005AE3F6 /* bspatch.c */; settings = {COMPILER_FLAGS = "-w"; }; }; 5D06E8EC0FD68CE4005AE3F6 /* SUBinaryDeltaApply.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D06E8E00FD68CC7005AE3F6 /* SUBinaryDeltaApply.m */; }; 5D06E8ED0FD68CE4005AE3F6 /* SUBinaryDeltaCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D06E8E20FD68CC7005AE3F6 /* SUBinaryDeltaCommon.m */; }; 5D06E8FD0FD68D6B005AE3F6 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D06E8FB0FD68D61005AE3F6 /* libbz2.dylib */; }; @@ -47,7 +75,7 @@ 5D06E9050FD68D7D005AE3F6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; }; 5D06E9390FD69271005AE3F6 /* SUBinaryDeltaUnarchiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D06E9370FD69271005AE3F6 /* SUBinaryDeltaUnarchiver.h */; }; 5D06E93A0FD69271005AE3F6 /* SUBinaryDeltaUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D06E9380FD69271005AE3F6 /* SUBinaryDeltaUnarchiver.m */; }; - 5D1AF58A0FD7678C0065DB48 /* libxar.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D1AF5890FD7678C0065DB48 /* libxar.1.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; + 5D1AF58A0FD7678C0065DB48 /* libxar.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D1AF5890FD7678C0065DB48 /* libxar.1.dylib */; }; 5D1AF58B0FD7678C0065DB48 /* libxar.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D1AF5890FD7678C0065DB48 /* libxar.1.dylib */; }; 5D1AF5900FD767AD0065DB48 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D1AF58F0FD767AD0065DB48 /* libxml2.dylib */; }; 5D1AF59A0FD767E50065DB48 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D1AF5990FD767E50065DB48 /* libz.dylib */; }; @@ -60,7 +88,6 @@ 6102FE4A0E07803800F85D09 /* SUDiskImageUnarchiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 6102FE480E07803800F85D09 /* SUDiskImageUnarchiver.h */; settings = {ATTRIBUTES = (); }; }; 6102FE4B0E07803800F85D09 /* SUDiskImageUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 6102FE490E07803800F85D09 /* SUDiskImageUnarchiver.m */; }; 6102FE5B0E08C7EC00F85D09 /* SUUnarchiver_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 6102FE590E08C7EC00F85D09 /* SUUnarchiver_Private.h */; settings = {ATTRIBUTES = (); }; }; - 6102FE5C0E08C7EC00F85D09 /* SUUnarchiver_Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 6102FE5A0E08C7EC00F85D09 /* SUUnarchiver_Private.m */; }; 610EC1E00CF3A5FE00AE239E /* NTSynchronousTask.m in Sources */ = {isa = PBXBuildFile; fileRef = 610EC1BF0CF3914D00AE239E /* NTSynchronousTask.m */; }; 611142E910FB1BE5009810AA /* bspatch.h in Headers */ = {isa = PBXBuildFile; fileRef = 611142E810FB1BE5009810AA /* bspatch.h */; }; 61177A1F0D1112E900749C97 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6117796E0D1112E000749C97 /* IOKit.framework */; }; @@ -70,7 +97,7 @@ 6120721309CC5C4B007FE0F6 /* SUAutomaticUpdateAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 6120721109CC5C4B007FE0F6 /* SUAutomaticUpdateAlert.m */; }; 61227A160DB548B800AB99EA /* SUVersionComparisonTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 61227A150DB548B800AB99EA /* SUVersionComparisonTest.m */; }; 61299A2F09CA2DAB00B7442F /* SUDSAVerifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 61299A2D09CA2DAB00B7442F /* SUDSAVerifier.h */; settings = {ATTRIBUTES = (); }; }; - 61299A3009CA2DAB00B7442F /* SUDSAVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A2E09CA2DAB00B7442F /* SUDSAVerifier.m */; }; + 61299A3009CA2DAB00B7442F /* SUDSAVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A2E09CA2DAB00B7442F /* SUDSAVerifier.m */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; }; 61299A4A09CA2DD000B7442F /* SUPlainInstallerInternals.h in Headers */ = {isa = PBXBuildFile; fileRef = 6129984309C9E2DA00B7442F /* SUPlainInstallerInternals.h */; settings = {ATTRIBUTES = (); }; }; 61299A5C09CA6D4500B7442F /* SUConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 61299A5B09CA6D4500B7442F /* SUConstants.h */; settings = {ATTRIBUTES = (); }; }; 61299A6009CA6EB100B7442F /* SUConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A5F09CA6EB100B7442F /* SUConstants.m */; }; @@ -79,12 +106,10 @@ 61299B3609CB04E000B7442F /* Sparkle.h in Headers */ = {isa = PBXBuildFile; fileRef = 61299B3509CB04E000B7442F /* Sparkle.h */; settings = {ATTRIBUTES = (Public, ); }; }; 612DCBAF0D488BC60015DBEA /* SUUpdatePermissionPrompt.h in Headers */ = {isa = PBXBuildFile; fileRef = 612DCBAD0D488BC60015DBEA /* SUUpdatePermissionPrompt.h */; settings = {ATTRIBUTES = (); }; }; 612DCBB00D488BC60015DBEA /* SUUpdatePermissionPrompt.m in Sources */ = {isa = PBXBuildFile; fileRef = 612DCBAE0D488BC60015DBEA /* SUUpdatePermissionPrompt.m */; }; - 61407C390A4099050009F71F /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; }; + 61407C390A4099050009F71F /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; }; 6158A1C5137904B300487EC1 /* SUUpdater_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 6158A1C4137904B300487EC1 /* SUUpdater_Private.h */; }; 615AE3D00D64DC40001CA7BD /* SUModelTranslation.plist in Resources */ = {isa = PBXBuildFile; fileRef = 615AE3CF0D64DC40001CA7BD /* SUModelTranslation.plist */; }; 6160E7E10D3B4A8800E9CD71 /* NTSynchronousTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 610EC1C00CF3914D00AE239E /* NTSynchronousTask.h */; settings = {ATTRIBUTES = (); }; }; - 61699BCC0DDB92BD005878A4 /* SUVersionComparisonTest.h in Headers */ = {isa = PBXBuildFile; fileRef = 61227A140DB548B800AB99EA /* SUVersionComparisonTest.h */; settings = {ATTRIBUTES = (); }; }; - 618E9CFD0E7328F1004646D8 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 618E9CFC0E7328F1004646D8 /* dsa_pub.pem */; }; 618FA5010DAE88B40026945C /* SUInstaller.h in Headers */ = {isa = PBXBuildFile; fileRef = 618FA4FF0DAE88B40026945C /* SUInstaller.h */; settings = {ATTRIBUTES = (); }; }; 618FA5020DAE88B40026945C /* SUInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 618FA5000DAE88B40026945C /* SUInstaller.m */; }; 618FA5050DAE8AB80026945C /* SUPlainInstaller.h in Headers */ = {isa = PBXBuildFile; fileRef = 618FA5030DAE8AB80026945C /* SUPlainInstaller.h */; settings = {ATTRIBUTES = (); }; }; @@ -94,7 +119,7 @@ 6196CFF909C72148000DC222 /* SUStatusController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6196CFE309C71ADE000DC222 /* SUStatusController.h */; settings = {ATTRIBUTES = (); }; }; 6196CFFA09C72149000DC222 /* SUStatusController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6196CFE409C71ADE000DC222 /* SUStatusController.m */; }; 61A2259E0D1C495D00430CCD /* SUVersionComparisonProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 61A2259C0D1C495D00430CCD /* SUVersionComparisonProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 61A225A40D1C4AC000430CCD /* SUStandardVersionComparator.h in Headers */ = {isa = PBXBuildFile; fileRef = 61A225A20D1C4AC000430CCD /* SUStandardVersionComparator.h */; settings = {ATTRIBUTES = (); }; }; + 61A225A40D1C4AC000430CCD /* SUStandardVersionComparator.h in Headers */ = {isa = PBXBuildFile; fileRef = 61A225A20D1C4AC000430CCD /* SUStandardVersionComparator.h */; settings = {ATTRIBUTES = (Public, ); }; }; 61A225A50D1C4AC000430CCD /* SUStandardVersionComparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A225A30D1C4AC000430CCD /* SUStandardVersionComparator.m */; }; 61A2279C0D1CEE7600430CCD /* SUSystemProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 61A2279A0D1CEE7600430CCD /* SUSystemProfiler.h */; settings = {ATTRIBUTES = (); }; }; 61A2279D0D1CEE7600430CCD /* SUSystemProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A2279B0D1CEE7600430CCD /* SUSystemProfiler.m */; }; @@ -109,7 +134,7 @@ 61B5F8F709C4CEB300B25A18 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B5F8F609C4CEB300B25A18 /* Security.framework */; }; 61B5F90F09C4CF3A00B25A18 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; }; 61B5F92E09C4CFD800B25A18 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 61B5F92A09C4CFD800B25A18 /* InfoPlist.strings */; }; - 61B5F92F09C4CFD800B25A18 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 61B5F92C09C4CFD800B25A18 /* MainMenu.nib */; }; + 61B5F92F09C4CFD800B25A18 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61B5F92C09C4CFD800B25A18 /* MainMenu.xib */; }; 61B5F93009C4CFDC00B25A18 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5F92409C4CFC900B25A18 /* main.m */; }; 61B5FBB709C4FAFF00B25A18 /* SUAppcast.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5FB9509C4F04600B25A18 /* SUAppcast.m */; }; 61B5FC0D09C4FC8200B25A18 /* SUAppcast.h in Headers */ = {isa = PBXBuildFile; fileRef = 61B5FB9409C4F04600B25A18 /* SUAppcast.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -124,8 +149,6 @@ 61B93B280DD0FDD300DCD2F8 /* SUAutomaticUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B93B260DD0FDD300DCD2F8 /* SUAutomaticUpdateDriver.m */; }; 61B93C090DD112FF00DCD2F8 /* SUScheduledUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 61B93C070DD112FF00DCD2F8 /* SUScheduledUpdateDriver.h */; settings = {ATTRIBUTES = (); }; }; 61B93C0A0DD112FF00DCD2F8 /* SUScheduledUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B93C080DD112FF00DCD2F8 /* SUScheduledUpdateDriver.m */; }; - 61BBDF820A49220C00378739 /* Sparkle.icns in Resources */ = {isa = PBXBuildFile; fileRef = 61BBDF810A49220C00378739 /* Sparkle.icns */; }; - 61C2680A0E2DB5D000175E6C /* License.txt in Resources */ = {isa = PBXBuildFile; fileRef = 61C268090E2DB5D000175E6C /* License.txt */; }; 61CFB3290E385186007A1735 /* Sparkle.pch in Headers */ = {isa = PBXBuildFile; fileRef = 61CFB3280E385186007A1735 /* Sparkle.pch */; }; 61D85D6D0E10B2ED00F9B4A9 /* SUPipedUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 6129C0B90E0B79810062CE76 /* SUPipedUnarchiver.m */; }; 61EF67560E25B58D00F754E0 /* SUHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EF67550E25B58D00F754E0 /* SUHost.m */; }; @@ -133,18 +156,78 @@ 61F83F720DBFE140006FDD30 /* SUBasicUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F83F700DBFE137006FDD30 /* SUBasicUpdateDriver.m */; }; 61F83F740DBFE141006FDD30 /* SUBasicUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 61F83F6F0DBFE137006FDD30 /* SUBasicUpdateDriver.h */; settings = {ATTRIBUTES = (); }; }; 61FA52880E2D9EA400EF58AD /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; settings = {ATTRIBUTES = (Required, ); }; }; - 93FB277A156BD80D001937C7 /* SUPasswordPrompt.h in Headers */ = {isa = PBXBuildFile; fileRef = 93FB2778156BD80D001937C7 /* SUPasswordPrompt.h */; }; - 93FB277B156BD80D001937C7 /* SUPasswordPrompt.m in Sources */ = {isa = PBXBuildFile; fileRef = 93FB2779156BD80D001937C7 /* SUPasswordPrompt.m */; }; - 93FB277F156BD826001937C7 /* SUPasswordPrompt.xib in Resources */ = {isa = PBXBuildFile; fileRef = 93FB277D156BD826001937C7 /* SUPasswordPrompt.xib */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 1454BA1519637EDB00344E57 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 61B5F90109C4CEE200B25A18; + remoteInfo = "Sparkle Test App"; + }; + 1454BA1719637EE900344E57 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 1420DF491962329200203BB0; + remoteInfo = Documentation; + }; + 14732BCA1960F73500593899 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = Sparkle; + }; + 14732BCE1960F73500593899 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5D06E8CF0FD68C7C005AE3F6; + remoteInfo = BinaryDelta; + }; + 14950063195FB8A600BC5B5B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = Sparkle; + }; + 14950065195FB8A600BC5B5B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 61B5F90109C4CEE200B25A18; + remoteInfo = "Sparkle Test App"; + }; + 14950067195FB8A600BC5B5B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 612279D80DB5470200AB99EA; + remoteInfo = "Sparkle Unit Tests"; + }; + 14950069195FB8A600BC5B5B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5D06E8CF0FD68C7C005AE3F6; + remoteInfo = BinaryDelta; + }; + 1495006B195FB8A600BC5B5B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 55C14BB6136EEF1500649790; + remoteInfo = Autoupdate; + }; 55C14F96136F044100649790 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; proxyType = 1; remoteGlobalIDString = 55C14BB6136EEF1500649790; - remoteInfo = finish_installation; + remoteInfo = Autoupdate; }; 5D06E8D50FD68C86005AE3F6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -170,31 +253,57 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - 61B5FB4D09C4E9FA00B25A18 /* CopyFiles */ = { + 61B5FB4D09C4E9FA00B25A18 /* Copy Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 10; files = ( - 61407C390A4099050009F71F /* Sparkle.framework in CopyFiles */, + 61407C390A4099050009F71F /* Sparkle.framework in Copy Frameworks */, ); + name = "Copy Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 004A8652192A492B00C9730D /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/Sparkle.strings; sourceTree = ""; }; + 004A8653192A492B00C9730D /* ro */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ro; path = ro.lproj/SUAutomaticUpdateAlert.xib; sourceTree = ""; }; + 004A8654192A492B00C9730D /* ro */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ro; path = ro.lproj/SUUpdateAlert.xib; sourceTree = ""; }; + 004A8655192A492B00C9730D /* ro */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ro; path = ro.lproj/SUUpdatePermissionPrompt.xib; sourceTree = ""; }; 0263187214FEBB31005EBF43 /* uk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Sparkle.strings; sourceTree = ""; }; 0263187514FEBB42005EBF43 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = uk.lproj/SUAutomaticUpdateAlert.xib; sourceTree = ""; }; 0263187614FEBB42005EBF43 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = uk.lproj/SUUpdateAlert.xib; sourceTree = ""; }; 0263187714FEBB42005EBF43 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = uk.lproj/SUUpdatePermissionPrompt.xib; sourceTree = ""; }; - 0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; - 0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; + 0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; + 1420DF4D196247B500203BB0 /* build-docs.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "build-docs.sh"; sourceTree = ""; }; + 1420DF4E196247B500203BB0 /* Doxyfile */ = {isa = PBXFileReference; lastKnownFileType = text; path = Doxyfile; sourceTree = ""; }; + 1420DF4F196247F900203BB0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + 14732BB1195FF6B700593899 /* .clang-format */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".clang-format"; sourceTree = SOURCE_ROOT; }; + 14732BB91960EEEE00593899 /* SampleAppcast.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = SampleAppcast.xml; sourceTree = ""; }; + 14732BBA1960EF7100593899 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = SOURCE_ROOT; }; + 14732BBC1960EFB500593899 /* README.markdown */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.markdown; sourceTree = SOURCE_ROOT; }; + 14732BBF1960F0AC00593899 /* test_app_only_dsa_pub.pem */ = {isa = PBXFileReference; lastKnownFileType = text; path = test_app_only_dsa_pub.pem; sourceTree = ""; }; + 14732BC11960F3B200593899 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = SOURCE_ROOT; usesTabs = 1; }; + 14732BC31960F3FF00593899 /* generate_keys.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = generate_keys.sh; sourceTree = ""; }; + 14732BC41960F3FF00593899 /* sign_update.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = sign_update.sh; sourceTree = ""; }; + 14732BC91960F70A00593899 /* make-release-package.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "make-release-package.sh"; sourceTree = ""; }; + 14732BD219610A1800593899 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; + 14950074195FDF5900BC5B5B /* SUUpdaterTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUUpdaterTest.m; path = Tests/SUUpdaterTest.m; sourceTree = ""; usesTabs = 0; }; 3772FEA813DE0B6B00F79537 /* SUVersionDisplayProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUVersionDisplayProtocol.h; sourceTree = ""; }; - 525A278F133D6AE900FD8D70 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - 550347001370023A00AE7681 /* Sparkle.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Sparkle.icns; sourceTree = ""; }; - 55C14BB7136EEF1500649790 /* finish_installation.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = finish_installation.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 55C14BB9136EEF1500649790 /* finish_installation-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "finish_installation-Info.plist"; sourceTree = ""; }; - 55C14BD3136EEFCE00649790 /* finish_installation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = finish_installation.m; sourceTree = ""; }; + 4607BEA21948443800EF8DA4 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Sparkle.strings; sourceTree = ""; }; + 4607BEA31948443800EF8DA4 /* nb */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nb; path = nb.lproj/SUAutomaticUpdateAlert.xib; sourceTree = ""; }; + 4607BEA41948443800EF8DA4 /* nb */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nb; path = nb.lproj/SUUpdateAlert.xib; sourceTree = ""; }; + 4607BEA51948443800EF8DA4 /* nb */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nb; path = nb.lproj/SUUpdatePermissionPrompt.xib; sourceTree = ""; }; + 525A278F133D6AE900FD8D70 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; + 555CF29A196C52330000B31E /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Sparkle.strings; sourceTree = ""; }; + 555CF29B196C523E0000B31E /* el */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = el; path = el.lproj/SUAutomaticUpdateAlert.xib; sourceTree = ""; }; + 555CF29C196C52460000B31E /* el */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = el; path = el.lproj/SUUpdateAlert.xib; sourceTree = ""; }; + 555CF29D196C524C0000B31E /* el */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = el; path = el.lproj/SUUpdatePermissionPrompt.xib; sourceTree = ""; }; + 55C14BB7136EEF1500649790 /* Autoupdate.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Autoupdate.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 55C14BB9136EEF1500649790 /* Autoupdate-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Autoupdate-Info.plist"; sourceTree = ""; }; + 55C14BD3136EEFCE00649790 /* Autoupdate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Autoupdate.m; sourceTree = ""; }; 55C14BD8136EF00C00649790 /* SUStatus.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SUStatus.xib; sourceTree = ""; }; 55C14BDB136EF20D00649790 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = cs.lproj/SUAutomaticUpdateAlert.xib; sourceTree = ""; }; 55C14BDC136EF20D00649790 /* da */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = da; path = da.lproj/SUAutomaticUpdateAlert.xib; sourceTree = ""; }; @@ -252,8 +361,10 @@ 55C14C18136EF2C700649790 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_TW; path = zh_TW.lproj/SUUpdatePermissionPrompt.xib; sourceTree = ""; }; 55C14F04136EF6DB00649790 /* SULog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SULog.h; sourceTree = ""; }; 55C14F05136EF6DB00649790 /* SULog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SULog.m; sourceTree = ""; }; - 55C14F0E136EF73600649790 /* finish_installation.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = finish_installation.pch; sourceTree = ""; }; + 55C14F0E136EF73600649790 /* Autoupdate.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Autoupdate.pch; sourceTree = ""; }; 55C14F31136EFC2400649790 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; + 5AEF45D9189D1CC90030D7DC /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Sparkle.strings; sourceTree = ""; }; + 5AF9DC3B1981DBEE001EA135 /* SUDSAVerifierTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUDSAVerifierTest.m; path = Tests/SUDSAVerifierTest.m; sourceTree = ""; }; 5D06E8D00FD68C7C005AE3F6 /* BinaryDelta */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = BinaryDelta; sourceTree = BUILT_PRODUCTS_DIR; }; 5D06E8DB0FD68CB9005AE3F6 /* bsdiff.c */ = {isa = PBXFileReference; comments = "-Wno-shorten-64-to-32"; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bsdiff.c; sourceTree = ""; }; 5D06E8DC0FD68CB9005AE3F6 /* bspatch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bspatch.c; sourceTree = ""; }; @@ -261,16 +372,16 @@ 5D06E8E00FD68CC7005AE3F6 /* SUBinaryDeltaApply.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBinaryDeltaApply.m; sourceTree = ""; }; 5D06E8E10FD68CC7005AE3F6 /* SUBinaryDeltaCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUBinaryDeltaCommon.h; sourceTree = ""; }; 5D06E8E20FD68CC7005AE3F6 /* SUBinaryDeltaCommon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBinaryDeltaCommon.m; sourceTree = ""; }; - 5D06E8E30FD68CC7005AE3F6 /* SUBinaryDeltaTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBinaryDeltaTool.m; sourceTree = ""; }; + 5D06E8E30FD68CC7005AE3F6 /* SUBinaryDeltaTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBinaryDeltaTool.m; sourceTree = ""; usesTabs = 0; }; 5D06E8F10FD68D21005AE3F6 /* ConfigBinaryDelta.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigBinaryDelta.xcconfig; sourceTree = ""; }; 5D06E8F20FD68D21005AE3F6 /* ConfigBinaryDeltaDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigBinaryDeltaDebug.xcconfig; sourceTree = ""; }; 5D06E8F30FD68D21005AE3F6 /* ConfigBinaryDeltaRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigBinaryDeltaRelease.xcconfig; sourceTree = ""; }; - 5D06E8FB0FD68D61005AE3F6 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = /usr/lib/libbz2.dylib; sourceTree = ""; }; + 5D06E8FB0FD68D61005AE3F6 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; }; 5D06E9370FD69271005AE3F6 /* SUBinaryDeltaUnarchiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUBinaryDeltaUnarchiver.h; sourceTree = ""; }; 5D06E9380FD69271005AE3F6 /* SUBinaryDeltaUnarchiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBinaryDeltaUnarchiver.m; sourceTree = ""; }; - 5D1AF5890FD7678C0065DB48 /* libxar.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxar.1.dylib; path = /usr/lib/libxar.1.dylib; sourceTree = ""; }; - 5D1AF58F0FD767AD0065DB48 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = /usr/lib/libxml2.dylib; sourceTree = ""; }; - 5D1AF5990FD767E50065DB48 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = ""; }; + 5D1AF5890FD7678C0065DB48 /* libxar.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxar.1.dylib; path = usr/lib/libxar.1.dylib; sourceTree = SDKROOT; }; + 5D1AF58F0FD767AD0065DB48 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; }; + 5D1AF5990FD767E50065DB48 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 610134710DD250470049ACDF /* SUUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdateDriver.h; sourceTree = ""; }; 610134720DD250470049ACDF /* SUUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUpdateDriver.m; sourceTree = ""; }; 610134790DD2541A0049ACDF /* SUProbingUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUProbingUpdateDriver.h; sourceTree = ""; }; @@ -279,25 +390,21 @@ 6102FE480E07803800F85D09 /* SUDiskImageUnarchiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUDiskImageUnarchiver.h; sourceTree = ""; }; 6102FE490E07803800F85D09 /* SUDiskImageUnarchiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUDiskImageUnarchiver.m; sourceTree = ""; }; 6102FE590E08C7EC00F85D09 /* SUUnarchiver_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUnarchiver_Private.h; sourceTree = ""; }; - 6102FE5A0E08C7EC00F85D09 /* SUUnarchiver_Private.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUnarchiver_Private.m; sourceTree = ""; }; - 61072EB20DF2640C008FE88B /* ConfigFrameworkReleaseGCSupport.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigFrameworkReleaseGCSupport.xcconfig; sourceTree = ""; }; 610EC1BF0CF3914D00AE239E /* NTSynchronousTask.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NTSynchronousTask.m; sourceTree = ""; }; 610EC1C00CF3914D00AE239E /* NTSynchronousTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NTSynchronousTask.h; sourceTree = ""; }; 611142E810FB1BE5009810AA /* bspatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bspatch.h; sourceTree = ""; }; - 61131A050F846CE600E97AF6 /* da */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Sparkle.strings; sourceTree = ""; }; - 61131A090F846D0A00E97AF6 /* zh_CN */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/Sparkle.strings; sourceTree = ""; }; - 61131A0A0F846D1100E97AF6 /* zh_TW */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/Sparkle.strings; sourceTree = ""; }; - 6113C9D315BE1D3600C303E7 /* pt_BR */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_BR; path = pt_BR.lproj/SUPasswordPrompt.xib; sourceTree = ""; }; - 6117796E0D1112E000749C97 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; + 61131A050F846CE600E97AF6 /* da */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Sparkle.strings; sourceTree = ""; }; + 61131A090F846D0A00E97AF6 /* zh_CN */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/Sparkle.strings; sourceTree = ""; }; + 61131A0A0F846D1100E97AF6 /* zh_TW */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/Sparkle.strings; sourceTree = ""; }; + 6117796E0D1112E000749C97 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; 61180BC80D64138900B4E0D1 /* SUWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUWindowController.h; sourceTree = ""; }; 61180BC90D64138900B4E0D1 /* SUWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUWindowController.m; sourceTree = ""; }; - 611A904210240DD300CC659E /* pl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Sparkle.strings; sourceTree = ""; }; - 611A904610240DF700CC659E /* ja */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Sparkle.strings; sourceTree = ""; }; + 611A904210240DD300CC659E /* pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Sparkle.strings; sourceTree = ""; }; + 611A904610240DF700CC659E /* ja */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Sparkle.strings; sourceTree = ""; }; 6120721009CC5C4B007FE0F6 /* SUAutomaticUpdateAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUAutomaticUpdateAlert.h; sourceTree = ""; }; 6120721109CC5C4B007FE0F6 /* SUAutomaticUpdateAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUAutomaticUpdateAlert.m; sourceTree = ""; }; - 612279D90DB5470200AB99EA /* Sparkle Unit Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Sparkle Unit Tests.octest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 612279DA0DB5470200AB99EA /* Sparkle Unit Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Sparkle Unit Tests-Info.plist"; path = "Tests/Sparkle Unit Tests-Info.plist"; sourceTree = ""; }; - 61227A140DB548B800AB99EA /* SUVersionComparisonTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUVersionComparisonTest.h; path = Tests/SUVersionComparisonTest.h; sourceTree = ""; }; + 612279D90DB5470200AB99EA /* Sparkle Unit Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Sparkle Unit Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 612279DA0DB5470200AB99EA /* SparkleTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "SparkleTests-Info.plist"; path = "Tests/SparkleTests-Info.plist"; sourceTree = ""; }; 61227A150DB548B800AB99EA /* SUVersionComparisonTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUVersionComparisonTest.m; path = Tests/SUVersionComparisonTest.m; sourceTree = ""; }; 6129984309C9E2DA00B7442F /* SUPlainInstallerInternals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUPlainInstallerInternals.h; sourceTree = ""; }; 61299A2D09CA2DAB00B7442F /* SUDSAVerifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUDSAVerifier.h; sourceTree = ""; }; @@ -310,14 +417,12 @@ 6129C0B90E0B79810062CE76 /* SUPipedUnarchiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUPipedUnarchiver.m; sourceTree = ""; }; 612DCBAD0D488BC60015DBEA /* SUUpdatePermissionPrompt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdatePermissionPrompt.h; sourceTree = ""; }; 612DCBAE0D488BC60015DBEA /* SUUpdatePermissionPrompt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUpdatePermissionPrompt.m; sourceTree = ""; }; - 613151B20FB4946A000DCD59 /* is */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/Sparkle.strings; sourceTree = ""; }; - 6149E6EA1601ABAC008A351E /* ar */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Sparkle.strings; sourceTree = ""; }; + 613151B20FB4946A000DCD59 /* is */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/Sparkle.strings; sourceTree = ""; }; + 6149E6EA1601ABAC008A351E /* ar */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Sparkle.strings; sourceTree = ""; }; 6149E6ED1601ABAC008A351E /* ar */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ar; path = ar.lproj/SUAutomaticUpdateAlert.xib; sourceTree = ""; }; - 6149E6EE1601ABAC008A351E /* ar */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ar; path = ar.lproj/SUPasswordPrompt.xib; sourceTree = ""; }; 6149E6EF1601ABAC008A351E /* ar */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ar; path = ar.lproj/SUUpdateAlert.xib; sourceTree = ""; }; 6149E6F01601ABAC008A351E /* ar */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ar; path = ar.lproj/SUUpdatePermissionPrompt.xib; sourceTree = ""; }; - 615409A8103BA09100125AF1 /* ConfigTestAppReleaseGCSupport.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigTestAppReleaseGCSupport.xcconfig; sourceTree = ""; }; - 615409C4103BBC4000125AF1 /* cs */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Sparkle.strings; sourceTree = ""; }; + 615409C4103BBC4000125AF1 /* cs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Sparkle.strings; sourceTree = ""; }; 6158A1B81378F64700487EC1 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_PT; path = pt_PT.lproj/SUUpdatePermissionPrompt.xib; sourceTree = ""; }; 6158A1BA1378F68100487EC1 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_PT; path = pt_PT.lproj/SUAutomaticUpdateAlert.xib; sourceTree = ""; }; 6158A1BB1378F68100487EC1 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_PT; path = pt_PT.lproj/SUUpdateAlert.xib; sourceTree = ""; }; @@ -326,20 +431,18 @@ 6158A1C01378F8BB00487EC1 /* tr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = tr; path = tr.lproj/SUUpdatePermissionPrompt.xib; sourceTree = ""; }; 6158A1C4137904B300487EC1 /* SUUpdater_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdater_Private.h; sourceTree = ""; }; 615AE3CF0D64DC40001CA7BD /* SUModelTranslation.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SUModelTranslation.plist; sourceTree = ""; }; - 6160FD85134ABCD5007FFC5F /* tr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Sparkle.strings; sourceTree = ""; }; - 6186554310D7484E00B1E074 /* pt_PT */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt_PT; path = pt_PT.lproj/Sparkle.strings; sourceTree = ""; }; - 618915730E35937600B5E981 /* sv */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Sparkle.strings; sourceTree = ""; }; - 618E9CFC0E7328F1004646D8 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = "Test Application/dsa_pub.pem"; sourceTree = ""; }; + 6186554310D7484E00B1E074 /* pt_PT */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = pt_PT; path = pt_PT.lproj/Sparkle.strings; sourceTree = ""; }; + 618915730E35937600B5E981 /* sv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Sparkle.strings; sourceTree = ""; }; 618FA4FF0DAE88B40026945C /* SUInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUInstaller.h; sourceTree = ""; }; 618FA5000DAE88B40026945C /* SUInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUInstaller.m; sourceTree = ""; }; 618FA5030DAE8AB80026945C /* SUPlainInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUPlainInstaller.h; sourceTree = ""; }; 618FA5040DAE8AB80026945C /* SUPlainInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUPlainInstaller.m; sourceTree = ""; }; 618FA5200DAE8E8A0026945C /* SUPackageInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUPackageInstaller.h; sourceTree = ""; }; 618FA5210DAE8E8A0026945C /* SUPackageInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUPackageInstaller.m; sourceTree = ""; }; - 6195D4920E404AD700D41A50 /* ru */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Sparkle.strings; sourceTree = ""; }; + 6195D4920E404AD700D41A50 /* ru */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Sparkle.strings; sourceTree = ""; }; 6196CFE309C71ADE000DC222 /* SUStatusController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUStatusController.h; sourceTree = ""; }; 6196CFE409C71ADE000DC222 /* SUStatusController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUStatusController.m; sourceTree = ""; }; - 619B17200E1E9D0800E72754 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Sparkle.strings; sourceTree = ""; }; + 619B17200E1E9D0800E72754 /* de */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Sparkle.strings; sourceTree = ""; }; 61A2259C0D1C495D00430CCD /* SUVersionComparisonProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUVersionComparisonProtocol.h; sourceTree = ""; }; 61A225A20D1C4AC000430CCD /* SUStandardVersionComparator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUStandardVersionComparator.h; sourceTree = ""; }; 61A225A30D1C4AC000430CCD /* SUStandardVersionComparator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUStandardVersionComparator.m; sourceTree = ""; }; @@ -347,25 +450,24 @@ 61A2279B0D1CEE7600430CCD /* SUSystemProfiler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUSystemProfiler.m; sourceTree = ""; }; 61A354530DF113C70076ECB1 /* SUUserInitiatedUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUserInitiatedUpdateDriver.h; sourceTree = ""; }; 61A354540DF113C70076ECB1 /* SUUserInitiatedUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUserInitiatedUpdateDriver.m; sourceTree = ""; }; - 61AAE8230A321A7F00D8810D /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Sparkle.strings; sourceTree = ""; }; - 61AAE84F0A321AF700D8810D /* es */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Sparkle.strings; sourceTree = ""; }; - 61AAE8590A321B0400D8810D /* fr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Sparkle.strings; sourceTree = ""; }; - 61AAE8710A321F7700D8810D /* nl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Sparkle.strings; sourceTree = ""; }; + 61AAE8230A321A7F00D8810D /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Sparkle.strings; sourceTree = ""; }; + 61AAE84F0A321AF700D8810D /* es */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Sparkle.strings; sourceTree = ""; }; + 61AAE8590A321B0400D8810D /* fr */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Sparkle.strings; sourceTree = ""; }; + 61AAE8710A321F7700D8810D /* nl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Sparkle.strings; sourceTree = ""; }; 61B078CC15A5FB6100600039 /* SUCodeSigningVerifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUCodeSigningVerifier.h; sourceTree = ""; }; 61B078CD15A5FB6100600039 /* SUCodeSigningVerifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUCodeSigningVerifier.m; sourceTree = ""; }; - 61B26BF817B2F76600F99C77 /* da */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = da; path = da.lproj/SUPasswordPrompt.xib; sourceTree = ""; }; 61B5F8E309C4CE3C00B25A18 /* SUUpdater.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SUUpdater.h; sourceTree = ""; }; 61B5F8E409C4CE3C00B25A18 /* SUUpdater.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SUUpdater.m; sourceTree = ""; }; 61B5F8E509C4CE3C00B25A18 /* SUPlainInstallerInternals.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SUPlainInstallerInternals.m; sourceTree = ""; }; - 61B5F8F609C4CEB300B25A18 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = ""; }; + 61B5F8F609C4CEB300B25A18 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 61B5F90209C4CEE200B25A18 /* Sparkle Test App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Sparkle Test App.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 61B5F90409C4CEE200B25A18 /* Test Application-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Test Application-Info.plist"; path = "Test Application/Test Application-Info.plist"; sourceTree = ""; }; - 61B5F92409C4CFC900B25A18 /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = main.m; path = "Test Application/main.m"; sourceTree = ""; }; - 61B5F92B09C4CFD800B25A18 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = "Test Application/English.lproj/InfoPlist.strings"; sourceTree = ""; }; - 61B5F92D09C4CFD800B25A18 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = "Test Application/English.lproj/MainMenu.nib"; sourceTree = ""; }; + 61B5F90409C4CEE200B25A18 /* TestApplication-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TestApplication-Info.plist"; sourceTree = ""; }; + 61B5F92409C4CFC900B25A18 /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 61B5F92B09C4CFD800B25A18 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; + 61B5F92D09C4CFD800B25A18 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; }; 61B5FB9409C4F04600B25A18 /* SUAppcast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUAppcast.h; sourceTree = ""; }; 61B5FB9509C4F04600B25A18 /* SUAppcast.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUAppcast.m; sourceTree = ""; }; - 61B5FC3F09C4FD4000B25A18 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = ""; }; + 61B5FC3F09C4FD4000B25A18 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; 61B5FC5309C5182000B25A18 /* SUAppcastItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUAppcastItem.h; sourceTree = ""; }; 61B5FC5409C5182000B25A18 /* SUAppcastItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUAppcastItem.m; sourceTree = ""; }; 61B5FCA009C5228F00B25A18 /* SUUpdateAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdateAlert.h; sourceTree = ""; }; @@ -380,29 +482,20 @@ 61BA66DA14BDFC5500D02D86 /* sl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = sl; path = sl.lproj/SUAutomaticUpdateAlert.xib; sourceTree = ""; }; 61BA66DB14BDFC5500D02D86 /* sl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = sl; path = sl.lproj/SUUpdateAlert.xib; sourceTree = ""; }; 61BA66DC14BDFC5500D02D86 /* sl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = sl; path = sl.lproj/SUUpdatePermissionPrompt.xib; sourceTree = ""; }; - 61BBDF810A49220C00378739 /* Sparkle.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Sparkle.icns; sourceTree = ""; }; - 61C268090E2DB5D000175E6C /* License.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = License.txt; sourceTree = ""; }; + 61C268090E2DB5D000175E6C /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = SOURCE_ROOT; }; 61CFB3280E385186007A1735 /* Sparkle.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sparkle.pch; sourceTree = ""; }; - 61DEC1161477565C00931268 /* ro */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/Sparkle.strings; sourceTree = ""; }; - 61DEC1181477566800931268 /* ro */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ro; path = ro.lproj/SUUpdatePermissionPrompt.xib; sourceTree = ""; }; - 61DEC11A1477567800931268 /* ro */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ro; path = ro.lproj/SUUpdateAlert.xib; sourceTree = ""; }; - 61DEC11C1477568300931268 /* ro */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ro; path = ro.lproj/SUAutomaticUpdateAlert.xib; sourceTree = ""; }; - 61E31A80103299500051D188 /* pt_BR */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt_BR; path = pt_BR.lproj/Sparkle.strings; sourceTree = ""; }; + 61E31A80103299500051D188 /* pt_BR */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = pt_BR; path = pt_BR.lproj/Sparkle.strings; sourceTree = ""; }; 61EF67550E25B58D00F754E0 /* SUHost.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUHost.m; sourceTree = ""; }; 61EF67580E25C5B400F754E0 /* SUHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUHost.h; sourceTree = ""; }; 61F3AC1215C22D4A00260CA2 /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/Sparkle.strings; sourceTree = ""; }; 61F3AC1415C22D5900260CA2 /* th */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = th; path = th.lproj/SUAutomaticUpdateAlert.xib; sourceTree = ""; }; - 61F3AC1515C22D5900260CA2 /* th */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = th; path = th.lproj/SUPasswordPrompt.xib; sourceTree = ""; }; 61F3AC1615C22D5900260CA2 /* th */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = th; path = th.lproj/SUUpdateAlert.xib; sourceTree = ""; }; 61F3AC1715C22D5900260CA2 /* th */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = th; path = th.lproj/SUUpdatePermissionPrompt.xib; sourceTree = ""; }; - 61F614540E24A12D009F47E7 /* it */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Sparkle.strings; sourceTree = ""; }; + 61F614540E24A12D009F47E7 /* it */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Sparkle.strings; sourceTree = ""; }; 61F83F6F0DBFE137006FDD30 /* SUBasicUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUBasicUpdateDriver.h; sourceTree = ""; }; 61F83F700DBFE137006FDD30 /* SUBasicUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBasicUpdateDriver.m; sourceTree = ""; }; - 8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; + 8DC2EF5A0486A6940098B216 /* Sparkle-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Sparkle-Info.plist"; sourceTree = ""; }; 8DC2EF5B0486A6940098B216 /* Sparkle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Sparkle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 93FB2778156BD80D001937C7 /* SUPasswordPrompt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUPasswordPrompt.h; sourceTree = ""; }; - 93FB2779156BD80D001937C7 /* SUPasswordPrompt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUPasswordPrompt.m; sourceTree = ""; }; - 93FB277E156BD826001937C7 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/SUPasswordPrompt.xib; sourceTree = ""; }; FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigFrameworkDebug.xcconfig; sourceTree = ""; }; FA1941CB0D94A70100DD942E /* ConfigTestAppDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigTestAppDebug.xcconfig; sourceTree = ""; }; FA1941CC0D94A70100DD942E /* ConfigCommonRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigCommonRelease.xcconfig; sourceTree = ""; }; @@ -415,10 +508,11 @@ FA1941D30D94A70100DD942E /* ConfigRelaunchDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigRelaunchDebug.xcconfig; sourceTree = ""; }; FA1941D40D94A70100DD942E /* ConfigRelaunchRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigRelaunchRelease.xcconfig; sourceTree = ""; }; FA1941D50D94A70100DD942E /* ConfigFrameworkRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigFrameworkRelease.xcconfig; sourceTree = ""; }; - FA302AFD109D13190060F891 /* ConfigUnitTestReleaseGCSupport.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigUnitTestReleaseGCSupport.xcconfig; sourceTree = ""; }; FA3AAF391050B273004B3130 /* ConfigUnitTestRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigUnitTestRelease.xcconfig; sourceTree = ""; }; FA3AAF3A1050B273004B3130 /* ConfigUnitTestDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigUnitTestDebug.xcconfig; sourceTree = ""; }; FA3AAF3B1050B273004B3130 /* ConfigUnitTest.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigUnitTest.xcconfig; sourceTree = ""; }; + FE5536F517A2C6A7007CB333 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Sparkle.strings; sourceTree = ""; }; + FE5536F617A2C6AB007CB333 /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/Sparkle.strings; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -426,7 +520,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 55C14EE8136EF61D00649790 /* Cocoa.framework in Frameworks */, + 14950071195FCE3D00BC5B5B /* AppKit.framework in Frameworks */, + 14950070195FCE3A00BC5B5B /* Foundation.framework in Frameworks */, 55C14F9A136F045400649790 /* Security.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -435,12 +530,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5D06E8D80FD68C8E005AE3F6 /* Sparkle.framework in Frameworks */, - 5D06E8FF0FD68D6D005AE3F6 /* libbz2.dylib in Frameworks */, 5D06E9050FD68D7D005AE3F6 /* Foundation.framework in Frameworks */, + 5D06E8FF0FD68D6D005AE3F6 /* libbz2.dylib in Frameworks */, 5D1AF58B0FD7678C0065DB48 /* libxar.1.dylib in Frameworks */, 5D1AF5900FD767AD0065DB48 /* libxml2.dylib in Frameworks */, 5D1AF59A0FD767E50065DB48 /* libz.dylib in Frameworks */, + 5D06E8D80FD68C8E005AE3F6 /* Sparkle.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -448,7 +543,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 14732BD119610A1200593899 /* AppKit.framework in Frameworks */, + 14732BD019610A0D00593899 /* Foundation.framework in Frameworks */, 61FA52880E2D9EA400EF58AD /* Sparkle.framework in Frameworks */, + 14732BD319610A1800593899 /* XCTest.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -456,8 +554,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 14950073195FCE4E00BC5B5B /* AppKit.framework in Frameworks */, + 14950072195FCE4B00BC5B5B /* Foundation.framework in Frameworks */, 61B5F90F09C4CF3A00B25A18 /* Sparkle.framework in Frameworks */, - 525A27A0133D6B9700FD8D70 /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -465,14 +564,15 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 61B5F8F709C4CEB300B25A18 /* Security.framework in Frameworks */, - 61B5FC4C09C4FD5E00B25A18 /* WebKit.framework in Frameworks */, + 1495006E195FCE1100BC5B5B /* AppKit.framework in Frameworks */, + 1495006F195FCE1800BC5B5B /* Foundation.framework in Frameworks */, 61177A1F0D1112E900749C97 /* IOKit.framework in Frameworks */, 5D06E8FD0FD68D6B005AE3F6 /* libbz2.dylib in Frameworks */, 5D1AF58A0FD7678C0065DB48 /* libxar.1.dylib in Frameworks */, 5D1AF82B0FD768180065DB48 /* libz.dylib in Frameworks */, - 525A2790133D6AE900FD8D70 /* Cocoa.framework in Frameworks */, + 61B5F8F709C4CEB300B25A18 /* Security.framework in Frameworks */, 55C14F32136EFC2400649790 /* SystemConfiguration.framework in Frameworks */, + 61B5FC4C09C4FD5E00B25A18 /* WebKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -482,11 +582,11 @@ 034768DFFF38A50411DB9C8B /* Products */ = { isa = PBXGroup; children = ( - 8DC2EF5B0486A6940098B216 /* Sparkle.framework */, - 61B5F90209C4CEE200B25A18 /* Sparkle Test App.app */, - 612279D90DB5470200AB99EA /* Sparkle Unit Tests.octest */, 5D06E8D00FD68C7C005AE3F6 /* BinaryDelta */, - 55C14BB7136EEF1500649790 /* finish_installation.app */, + 55C14BB7136EEF1500649790 /* Autoupdate.app */, + 61B5F90209C4CEE200B25A18 /* Sparkle Test App.app */, + 612279D90DB5470200AB99EA /* Sparkle Unit Tests.xctest */, + 8DC2EF5B0486A6940098B216 /* Sparkle.framework */, ); name = Products; sourceTree = ""; @@ -494,73 +594,142 @@ 0867D691FE84028FC02AAC07 /* Sparkle */ = { isa = PBXGroup; children = ( - 61F83F6E0DBFE07A006FDD30 /* Update Control */, - 61299B3909CB055000B7442F /* Appcast Support */, - 618FA6DB0DB485440026945C /* Installation */, - 55C14BD5136EEFD000649790 /* finish_installation tool */, - 6101354A0DD25B7F0049ACDF /* Unarchiving */, - 61299B3A09CB056100B7442F /* User Interface */, - 61B5F8F309C4CE5900B25A18 /* Other Sources */, - 089C1665FE841158C02AAC07 /* Framework Resources */, + 1495006D195FBBBD00BC5B5B /* Sparkle */, + 14732BB81960EEB600593899 /* Resources */, 61227A100DB5484000AB99EA /* Tests */, - 61B5F91D09C4CF7F00B25A18 /* Test Application Sources */, - 0867D69AFE84028FC02AAC07 /* Apple Frameworks and Libraries */, + 61B5F91D09C4CF7F00B25A18 /* Test Application */, + 14732BB51960ECBA00593899 /* Third Party */, + 1420DE391962322200203BB0 /* Documentation */, FA1941C40D94A6EA00DD942E /* Configurations */, + 0867D69AFE84028FC02AAC07 /* Frameworks */, 034768DFFF38A50411DB9C8B /* Products */, ); name = Sparkle; sourceTree = ""; + usesTabs = 0; }; - 0867D69AFE84028FC02AAC07 /* Apple Frameworks and Libraries */ = { + 0867D69AFE84028FC02AAC07 /* Frameworks */ = { isa = PBXGroup; children = ( - 6117796E0D1112E000749C97 /* IOKit.framework */, - 61B5FC3F09C4FD4000B25A18 /* WebKit.framework */, - 61B5F8F609C4CEB300B25A18 /* Security.framework */, 0867D6A5FE840307C02AAC07 /* AppKit.framework */, - 0867D69BFE84028FC02AAC07 /* Foundation.framework */, - 5D06E8FB0FD68D61005AE3F6 /* libbz2.dylib */, - 5D1AF58F0FD767AD0065DB48 /* libxml2.dylib */, - 5D1AF5890FD7678C0065DB48 /* libxar.1.dylib */, - 5D1AF5990FD767E50065DB48 /* libz.dylib */, 525A278F133D6AE900FD8D70 /* Cocoa.framework */, + 0867D69BFE84028FC02AAC07 /* Foundation.framework */, + 6117796E0D1112E000749C97 /* IOKit.framework */, + 5D06E8FB0FD68D61005AE3F6 /* libbz2.dylib */, + 5D1AF5890FD7678C0065DB48 /* libxar.1.dylib */, + 5D1AF58F0FD767AD0065DB48 /* libxml2.dylib */, + 5D1AF5990FD767E50065DB48 /* libz.dylib */, + 61B5F8F609C4CEB300B25A18 /* Security.framework */, 55C14F31136EFC2400649790 /* SystemConfiguration.framework */, + 61B5FC3F09C4FD4000B25A18 /* WebKit.framework */, + 14732BD219610A1800593899 /* XCTest.framework */, ); - name = "Apple Frameworks and Libraries"; + name = Frameworks; sourceTree = ""; }; 089C1665FE841158C02AAC07 /* Framework Resources */ = { isa = PBXGroup; children = ( - 8DC2EF5A0486A6940098B216 /* Info.plist */, - 615AE3CF0D64DC40001CA7BD /* SUModelTranslation.plist */, - 61C268090E2DB5D000175E6C /* License.txt */, + 8DC2EF5A0486A6940098B216 /* Sparkle-Info.plist */, 61AAE8220A321A7F00D8810D /* Sparkle.strings */, - 55C14C05136EF2C700649790 /* SUUpdatePermissionPrompt.xib */, - 55C14BF0136EF26100649790 /* SUUpdateAlert.xib */, 55C14BDA136EF20D00649790 /* SUAutomaticUpdateAlert.xib */, 55C14BD8136EF00C00649790 /* SUStatus.xib */, - 93FB277D156BD826001937C7 /* SUPasswordPrompt.xib */, + 55C14BF0136EF26100649790 /* SUUpdateAlert.xib */, + 55C14C05136EF2C700649790 /* SUUpdatePermissionPrompt.xib */, ); name = "Framework Resources"; sourceTree = ""; }; - 55C14BD5136EEFD000649790 /* finish_installation tool */ = { + 1420DE391962322200203BB0 /* Documentation */ = { isa = PBXGroup; children = ( - 55C14BB9136EEF1500649790 /* finish_installation-Info.plist */, - 55C14BD3136EEFCE00649790 /* finish_installation.m */, - 55C14F0E136EF73600649790 /* finish_installation.pch */, - 550347001370023A00AE7681 /* Sparkle.icns */, + 1420DF4E196247B500203BB0 /* Doxyfile */, + 1420DF4D196247B500203BB0 /* build-docs.sh */, ); - name = "finish_installation tool"; + path = Documentation; + sourceTree = ""; + }; + 14732BB51960ECBA00593899 /* Third Party */ = { + isa = PBXGroup; + children = ( + 14732BB61960ECE800593899 /* bsdiff */, + 14732BB71960ECF000593899 /* CocoatechCore */, + ); + name = "Third Party"; + path = Vendor; + sourceTree = ""; + }; + 14732BB61960ECE800593899 /* bsdiff */ = { + isa = PBXGroup; + children = ( + 5D06E8DB0FD68CB9005AE3F6 /* bsdiff.c */, + 5D06E8DC0FD68CB9005AE3F6 /* bspatch.c */, + 611142E810FB1BE5009810AA /* bspatch.h */, + ); + path = bsdiff; + sourceTree = ""; + }; + 14732BB71960ECF000593899 /* CocoatechCore */ = { + isa = PBXGroup; + children = ( + 610EC1C00CF3914D00AE239E /* NTSynchronousTask.h */, + 610EC1BF0CF3914D00AE239E /* NTSynchronousTask.m */, + ); + path = CocoatechCore; + sourceTree = ""; + }; + 14732BB81960EEB600593899 /* Resources */ = { + isa = PBXGroup; + children = ( + 14732BC21960F3FF00593899 /* bin */, + 14732BBA1960EF7100593899 /* CHANGELOG */, + 61C268090E2DB5D000175E6C /* LICENSE */, + 14732BC11960F3B200593899 /* Makefile */, + 1420DF4F196247F900203BB0 /* Images.xcassets */, + 14732BBC1960EFB500593899 /* README.markdown */, + 14732BB91960EEEE00593899 /* SampleAppcast.xml */, + 615AE3CF0D64DC40001CA7BD /* SUModelTranslation.plist */, + ); + path = Resources; + sourceTree = ""; + }; + 14732BC21960F3FF00593899 /* bin */ = { + isa = PBXGroup; + children = ( + 14732BC31960F3FF00593899 /* generate_keys.sh */, + 14732BC41960F3FF00593899 /* sign_update.sh */, + ); + path = bin; + sourceTree = SOURCE_ROOT; + }; + 1495006D195FBBBD00BC5B5B /* Sparkle */ = { + isa = PBXGroup; + children = ( + 61299B3909CB055000B7442F /* Appcast Support */, + 55C14BD5136EEFD000649790 /* Autoupdate */, + 089C1665FE841158C02AAC07 /* Framework Resources */, + 618FA6DB0DB485440026945C /* Installation */, + 61B5F8F309C4CE5900B25A18 /* Other Sources */, + 6101354A0DD25B7F0049ACDF /* Unarchiving */, + 61F83F6E0DBFE07A006FDD30 /* Update Control */, + 61299B3A09CB056100B7442F /* User Interface */, + ); + path = Sparkle; + sourceTree = ""; + }; + 55C14BD5136EEFD000649790 /* Autoupdate */ = { + isa = PBXGroup; + children = ( + 55C14BB9136EEF1500649790 /* Autoupdate-Info.plist */, + 55C14BD3136EEFCE00649790 /* Autoupdate.m */, + 55C14F0E136EF73600649790 /* Autoupdate.pch */, + ); + path = Autoupdate; sourceTree = ""; }; 5D06E8D90FD68C95005AE3F6 /* Binary Delta */ = { isa = PBXGroup; children = ( - 5D06E8DB0FD68CB9005AE3F6 /* bsdiff.c */, - 5D06E8DC0FD68CB9005AE3F6 /* bspatch.c */, 5D06E8DF0FD68CC7005AE3F6 /* SUBinaryDeltaApply.h */, 5D06E8E00FD68CC7005AE3F6 /* SUBinaryDeltaApply.m */, 5D06E8E10FD68CC7005AE3F6 /* SUBinaryDeltaCommon.h */, @@ -568,7 +737,6 @@ 5D06E8E30FD68CC7005AE3F6 /* SUBinaryDeltaTool.m */, 5D06E9370FD69271005AE3F6 /* SUBinaryDeltaUnarchiver.h */, 5D06E9380FD69271005AE3F6 /* SUBinaryDeltaUnarchiver.m */, - 611142E810FB1BE5009810AA /* bspatch.h */, ); name = "Binary Delta"; sourceTree = ""; @@ -577,16 +745,13 @@ isa = PBXGroup; children = ( 5D06E8D90FD68C95005AE3F6 /* Binary Delta */, + 6102FE480E07803800F85D09 /* SUDiskImageUnarchiver.h */, + 6102FE490E07803800F85D09 /* SUDiskImageUnarchiver.m */, + 6102FE440E077FCE00F85D09 /* SUPipedUnarchiver.h */, + 6129C0B90E0B79810062CE76 /* SUPipedUnarchiver.m */, 61299A8B09CA790200B7442F /* SUUnarchiver.h */, 61299A8C09CA790200B7442F /* SUUnarchiver.m */, 6102FE590E08C7EC00F85D09 /* SUUnarchiver_Private.h */, - 6102FE5A0E08C7EC00F85D09 /* SUUnarchiver_Private.m */, - 6102FE440E077FCE00F85D09 /* SUPipedUnarchiver.h */, - 6129C0B90E0B79810062CE76 /* SUPipedUnarchiver.m */, - 6102FE480E07803800F85D09 /* SUDiskImageUnarchiver.h */, - 6102FE490E07803800F85D09 /* SUDiskImageUnarchiver.m */, - 610EC1C00CF3914D00AE239E /* NTSynchronousTask.h */, - 610EC1BF0CF3914D00AE239E /* NTSynchronousTask.m */, ); name = Unarchiving; sourceTree = ""; @@ -594,9 +759,10 @@ 61227A100DB5484000AB99EA /* Tests */ = { isa = PBXGroup; children = ( - 61227A140DB548B800AB99EA /* SUVersionComparisonTest.h */, + 612279DA0DB5470200AB99EA /* SparkleTests-Info.plist */, + 5AF9DC3B1981DBEE001EA135 /* SUDSAVerifierTest.m */, + 14950074195FDF5900BC5B5B /* SUUpdaterTest.m */, 61227A150DB548B800AB99EA /* SUVersionComparisonTest.m */, - 612279DA0DB5470200AB99EA /* Sparkle Unit Tests-Info.plist */, ); name = Tests; sourceTree = ""; @@ -608,12 +774,12 @@ 61B5FB9509C4F04600B25A18 /* SUAppcast.m */, 61B5FC5309C5182000B25A18 /* SUAppcastItem.h */, 61B5FC5409C5182000B25A18 /* SUAppcastItem.m */, + 61A225A20D1C4AC000430CCD /* SUStandardVersionComparator.h */, + 61A225A30D1C4AC000430CCD /* SUStandardVersionComparator.m */, 61A2279A0D1CEE7600430CCD /* SUSystemProfiler.h */, 61A2279B0D1CEE7600430CCD /* SUSystemProfiler.m */, 61A2259C0D1C495D00430CCD /* SUVersionComparisonProtocol.h */, 3772FEA813DE0B6B00F79537 /* SUVersionDisplayProtocol.h */, - 61A225A20D1C4AC000430CCD /* SUStandardVersionComparator.h */, - 61A225A30D1C4AC000430CCD /* SUStandardVersionComparator.m */, ); name = "Appcast Support"; sourceTree = ""; @@ -621,18 +787,16 @@ 61299B3A09CB056100B7442F /* User Interface */ = { isa = PBXGroup; children = ( - 61B5FCA009C5228F00B25A18 /* SUUpdateAlert.h */, - 61B5FCA109C5228F00B25A18 /* SUUpdateAlert.m */, 6120721009CC5C4B007FE0F6 /* SUAutomaticUpdateAlert.h */, 6120721109CC5C4B007FE0F6 /* SUAutomaticUpdateAlert.m */, 6196CFE309C71ADE000DC222 /* SUStatusController.h */, 6196CFE409C71ADE000DC222 /* SUStatusController.m */, + 61B5FCA009C5228F00B25A18 /* SUUpdateAlert.h */, + 61B5FCA109C5228F00B25A18 /* SUUpdateAlert.m */, 612DCBAD0D488BC60015DBEA /* SUUpdatePermissionPrompt.h */, 612DCBAE0D488BC60015DBEA /* SUUpdatePermissionPrompt.m */, 61180BC80D64138900B4E0D1 /* SUWindowController.h */, 61180BC90D64138900B4E0D1 /* SUWindowController.m */, - 93FB2778156BD80D001937C7 /* SUPasswordPrompt.h */, - 93FB2779156BD80D001937C7 /* SUPasswordPrompt.m */, ); name = "User Interface"; sourceTree = ""; @@ -642,12 +806,12 @@ children = ( 618FA4FF0DAE88B40026945C /* SUInstaller.h */, 618FA5000DAE88B40026945C /* SUInstaller.m */, + 618FA5200DAE8E8A0026945C /* SUPackageInstaller.h */, + 618FA5210DAE8E8A0026945C /* SUPackageInstaller.m */, 618FA5030DAE8AB80026945C /* SUPlainInstaller.h */, 618FA5040DAE8AB80026945C /* SUPlainInstaller.m */, 6129984309C9E2DA00B7442F /* SUPlainInstallerInternals.h */, 61B5F8E509C4CE3C00B25A18 /* SUPlainInstallerInternals.m */, - 618FA5200DAE8E8A0026945C /* SUPackageInstaller.h */, - 618FA5210DAE8E8A0026945C /* SUPackageInstaller.m */, ); name = Installation; sourceTree = ""; @@ -655,12 +819,12 @@ 61B5F8F309C4CE5900B25A18 /* Other Sources */ = { isa = PBXGroup; children = ( - 61EF67580E25C5B400F754E0 /* SUHost.h */, - 61EF67550E25B58D00F754E0 /* SUHost.m */, 61299B3509CB04E000B7442F /* Sparkle.h */, 61CFB3280E385186007A1735 /* Sparkle.pch */, 61299A5B09CA6D4500B7442F /* SUConstants.h */, 61299A5F09CA6EB100B7442F /* SUConstants.m */, + 61EF67580E25C5B400F754E0 /* SUHost.h */, + 61EF67550E25B58D00F754E0 /* SUHost.m */, 55C14F04136EF6DB00649790 /* SULog.h */, 55C14F05136EF6DB00649790 /* SULog.m */, ); @@ -668,26 +832,26 @@ name = "Other Sources"; sourceTree = ""; }; - 61B5F91D09C4CF7F00B25A18 /* Test Application Sources */ = { + 61B5F91D09C4CF7F00B25A18 /* Test Application */ = { isa = PBXGroup; children = ( - 61BBDF810A49220C00378739 /* Sparkle.icns */, + 14732BBF1960F0AC00593899 /* test_app_only_dsa_pub.pem */, 61B5F92A09C4CFD800B25A18 /* InfoPlist.strings */, - 61B5F92C09C4CFD800B25A18 /* MainMenu.nib */, 61B5F92409C4CFC900B25A18 /* main.m */, - 61B5F90409C4CEE200B25A18 /* Test Application-Info.plist */, - 618E9CFC0E7328F1004646D8 /* dsa_pub.pem */, + 61B5F92C09C4CFD800B25A18 /* MainMenu.xib */, + 61B5F90409C4CEE200B25A18 /* TestApplication-Info.plist */, ); - name = "Test Application Sources"; + name = "Test Application"; + path = TestApplication; sourceTree = ""; }; 61CFB2C10E384958007A1735 /* Support */ = { isa = PBXGroup; children = ( - 61299A2D09CA2DAB00B7442F /* SUDSAVerifier.h */, - 61299A2E09CA2DAB00B7442F /* SUDSAVerifier.m */, 61B078CC15A5FB6100600039 /* SUCodeSigningVerifier.h */, 61B078CD15A5FB6100600039 /* SUCodeSigningVerifier.m */, + 61299A2D09CA2DAB00B7442F /* SUDSAVerifier.h */, + 61299A2E09CA2DAB00B7442F /* SUDSAVerifier.m */, ); name = Support; sourceTree = ""; @@ -695,18 +859,18 @@ 61CFB2C20E38496B007A1735 /* Drivers */ = { isa = PBXGroup; children = ( - 610134710DD250470049ACDF /* SUUpdateDriver.h */, - 610134720DD250470049ACDF /* SUUpdateDriver.m */, - 61F83F6F0DBFE137006FDD30 /* SUBasicUpdateDriver.h */, - 61F83F700DBFE137006FDD30 /* SUBasicUpdateDriver.m */, - 61B93A390DD02D6400DCD2F8 /* SUUIBasedUpdateDriver.h */, - 61B93A3A0DD02D6400DCD2F8 /* SUUIBasedUpdateDriver.m */, 61B93B250DD0FDD300DCD2F8 /* SUAutomaticUpdateDriver.h */, 61B93B260DD0FDD300DCD2F8 /* SUAutomaticUpdateDriver.m */, - 61B93C070DD112FF00DCD2F8 /* SUScheduledUpdateDriver.h */, - 61B93C080DD112FF00DCD2F8 /* SUScheduledUpdateDriver.m */, + 61F83F6F0DBFE137006FDD30 /* SUBasicUpdateDriver.h */, + 61F83F700DBFE137006FDD30 /* SUBasicUpdateDriver.m */, 610134790DD2541A0049ACDF /* SUProbingUpdateDriver.h */, 6101347A0DD2541A0049ACDF /* SUProbingUpdateDriver.m */, + 61B93C070DD112FF00DCD2F8 /* SUScheduledUpdateDriver.h */, + 61B93C080DD112FF00DCD2F8 /* SUScheduledUpdateDriver.m */, + 61B93A390DD02D6400DCD2F8 /* SUUIBasedUpdateDriver.h */, + 61B93A3A0DD02D6400DCD2F8 /* SUUIBasedUpdateDriver.m */, + 610134710DD250470049ACDF /* SUUpdateDriver.h */, + 610134720DD250470049ACDF /* SUUpdateDriver.m */, 61A354530DF113C70076ECB1 /* SUUserInitiatedUpdateDriver.h */, 61A354540DF113C70076ECB1 /* SUUserInitiatedUpdateDriver.m */, ); @@ -716,11 +880,11 @@ 61F83F6E0DBFE07A006FDD30 /* Update Control */ = { isa = PBXGroup; children = ( - 61B5F8E309C4CE3C00B25A18 /* SUUpdater.h */, - 6158A1C4137904B300487EC1 /* SUUpdater_Private.h */, - 61B5F8E409C4CE3C00B25A18 /* SUUpdater.m */, 61CFB2C20E38496B007A1735 /* Drivers */, 61CFB2C10E384958007A1735 /* Support */, + 61B5F8E309C4CE3C00B25A18 /* SUUpdater.h */, + 61B5F8E409C4CE3C00B25A18 /* SUUpdater.m */, + 6158A1C4137904B300487EC1 /* SUUpdater_Private.h */, ); name = "Update Control"; sourceTree = ""; @@ -728,6 +892,7 @@ FA1941C40D94A6EA00DD942E /* Configurations */ = { isa = PBXGroup; children = ( + 14732BB1195FF6B700593899 /* .clang-format */, 5D06E8F10FD68D21005AE3F6 /* ConfigBinaryDelta.xcconfig */, 5D06E8F20FD68D21005AE3F6 /* ConfigBinaryDeltaDebug.xcconfig */, 5D06E8F30FD68D21005AE3F6 /* ConfigBinaryDeltaRelease.xcconfig */, @@ -737,18 +902,16 @@ FA1941D10D94A70100DD942E /* ConfigFramework.xcconfig */, FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */, FA1941D50D94A70100DD942E /* ConfigFrameworkRelease.xcconfig */, - 61072EB20DF2640C008FE88B /* ConfigFrameworkReleaseGCSupport.xcconfig */, - FA1941CD0D94A70100DD942E /* ConfigTestApp.xcconfig */, - FA1941CB0D94A70100DD942E /* ConfigTestAppDebug.xcconfig */, - FA1941D20D94A70100DD942E /* ConfigTestAppRelease.xcconfig */, - 615409A8103BA09100125AF1 /* ConfigTestAppReleaseGCSupport.xcconfig */, FA1941CE0D94A70100DD942E /* ConfigRelaunch.xcconfig */, FA1941D30D94A70100DD942E /* ConfigRelaunchDebug.xcconfig */, FA1941D40D94A70100DD942E /* ConfigRelaunchRelease.xcconfig */, + FA1941CD0D94A70100DD942E /* ConfigTestApp.xcconfig */, + FA1941CB0D94A70100DD942E /* ConfigTestAppDebug.xcconfig */, + FA1941D20D94A70100DD942E /* ConfigTestAppRelease.xcconfig */, FA3AAF3B1050B273004B3130 /* ConfigUnitTest.xcconfig */, FA3AAF3A1050B273004B3130 /* ConfigUnitTestDebug.xcconfig */, FA3AAF391050B273004B3130 /* ConfigUnitTestRelease.xcconfig */, - FA302AFD109D13190060F891 /* ConfigUnitTestReleaseGCSupport.xcconfig */, + 14732BC91960F70A00593899 /* make-release-package.sh */, ); path = Configurations; sourceTree = ""; @@ -760,56 +923,89 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 61B5F8ED09C4CE3C00B25A18 /* SUUpdater.h in Headers */, - 3772FEA913DE0B6B00F79537 /* SUVersionDisplayProtocol.h in Headers */, + 55C14F0F136EF73600649790 /* Autoupdate.pch in Headers */, + 611142E910FB1BE5009810AA /* bspatch.h in Headers */, + 6160E7E10D3B4A8800E9CD71 /* NTSynchronousTask.h in Headers */, + 61299B3609CB04E000B7442F /* Sparkle.h in Headers */, + 61CFB3290E385186007A1735 /* Sparkle.pch in Headers */, 61B5FC0D09C4FC8200B25A18 /* SUAppcast.h in Headers */, 61B5FC7009C51F4A00B25A18 /* SUAppcastItem.h in Headers */, - 61B5FCDF09C52A9F00B25A18 /* SUUpdateAlert.h in Headers */, - 6196CFF909C72148000DC222 /* SUStatusController.h in Headers */, - 61299A2F09CA2DAB00B7442F /* SUDSAVerifier.h in Headers */, - 61299A4A09CA2DD000B7442F /* SUPlainInstallerInternals.h in Headers */, - 61299A5C09CA6D4500B7442F /* SUConstants.h in Headers */, - 61299A8D09CA790200B7442F /* SUUnarchiver.h in Headers */, - 61299B3609CB04E000B7442F /* Sparkle.h in Headers */, 6120721209CC5C4B007FE0F6 /* SUAutomaticUpdateAlert.h in Headers */, - 61A2259E0D1C495D00430CCD /* SUVersionComparisonProtocol.h in Headers */, - 61A225A40D1C4AC000430CCD /* SUStandardVersionComparator.h in Headers */, - 61A2279C0D1CEE7600430CCD /* SUSystemProfiler.h in Headers */, - 6160E7E10D3B4A8800E9CD71 /* NTSynchronousTask.h in Headers */, - 612DCBAF0D488BC60015DBEA /* SUUpdatePermissionPrompt.h in Headers */, - 61180BCA0D64138900B4E0D1 /* SUWindowController.h in Headers */, - 618FA5010DAE88B40026945C /* SUInstaller.h in Headers */, - 618FA5050DAE8AB80026945C /* SUPlainInstaller.h in Headers */, - 618FA5220DAE8E8A0026945C /* SUPackageInstaller.h in Headers */, - 61F83F740DBFE141006FDD30 /* SUBasicUpdateDriver.h in Headers */, - 61B93A3C0DD02D7000DCD2F8 /* SUUIBasedUpdateDriver.h in Headers */, 61B93B270DD0FDD300DCD2F8 /* SUAutomaticUpdateDriver.h in Headers */, - 61B93C090DD112FF00DCD2F8 /* SUScheduledUpdateDriver.h in Headers */, - 610134730DD250470049ACDF /* SUUpdateDriver.h in Headers */, - 6101347B0DD2541A0049ACDF /* SUProbingUpdateDriver.h in Headers */, - 61699BCC0DDB92BD005878A4 /* SUVersionComparisonTest.h in Headers */, - 61A354550DF113C70076ECB1 /* SUUserInitiatedUpdateDriver.h in Headers */, - 6102FE460E077FCE00F85D09 /* SUPipedUnarchiver.h in Headers */, - 6102FE4A0E07803800F85D09 /* SUDiskImageUnarchiver.h in Headers */, - 6102FE5B0E08C7EC00F85D09 /* SUUnarchiver_Private.h in Headers */, - 61EF67590E25C5B400F754E0 /* SUHost.h in Headers */, - 61CFB3290E385186007A1735 /* Sparkle.pch in Headers */, + 61F83F740DBFE141006FDD30 /* SUBasicUpdateDriver.h in Headers */, 5D06E9390FD69271005AE3F6 /* SUBinaryDeltaUnarchiver.h in Headers */, - 611142E910FB1BE5009810AA /* bspatch.h in Headers */, - 55C14F06136EF6DB00649790 /* SULog.h in Headers */, - 55C14F0F136EF73600649790 /* finish_installation.pch in Headers */, - 6158A1C5137904B300487EC1 /* SUUpdater_Private.h in Headers */, - 93FB277A156BD80D001937C7 /* SUPasswordPrompt.h in Headers */, 61B078CE15A5FB6100600039 /* SUCodeSigningVerifier.h in Headers */, + 61299A5C09CA6D4500B7442F /* SUConstants.h in Headers */, + 6102FE4A0E07803800F85D09 /* SUDiskImageUnarchiver.h in Headers */, + 61299A2F09CA2DAB00B7442F /* SUDSAVerifier.h in Headers */, + 61EF67590E25C5B400F754E0 /* SUHost.h in Headers */, + 618FA5010DAE88B40026945C /* SUInstaller.h in Headers */, + 55C14F06136EF6DB00649790 /* SULog.h in Headers */, + 618FA5220DAE8E8A0026945C /* SUPackageInstaller.h in Headers */, + 6102FE460E077FCE00F85D09 /* SUPipedUnarchiver.h in Headers */, + 618FA5050DAE8AB80026945C /* SUPlainInstaller.h in Headers */, + 61299A4A09CA2DD000B7442F /* SUPlainInstallerInternals.h in Headers */, + 6101347B0DD2541A0049ACDF /* SUProbingUpdateDriver.h in Headers */, + 61B93C090DD112FF00DCD2F8 /* SUScheduledUpdateDriver.h in Headers */, + 61A225A40D1C4AC000430CCD /* SUStandardVersionComparator.h in Headers */, + 6196CFF909C72148000DC222 /* SUStatusController.h in Headers */, + 61A2279C0D1CEE7600430CCD /* SUSystemProfiler.h in Headers */, + 61B93A3C0DD02D7000DCD2F8 /* SUUIBasedUpdateDriver.h in Headers */, + 61299A8D09CA790200B7442F /* SUUnarchiver.h in Headers */, + 6102FE5B0E08C7EC00F85D09 /* SUUnarchiver_Private.h in Headers */, + 61B5FCDF09C52A9F00B25A18 /* SUUpdateAlert.h in Headers */, + 610134730DD250470049ACDF /* SUUpdateDriver.h in Headers */, + 612DCBAF0D488BC60015DBEA /* SUUpdatePermissionPrompt.h in Headers */, + 61B5F8ED09C4CE3C00B25A18 /* SUUpdater.h in Headers */, + 6158A1C5137904B300487EC1 /* SUUpdater_Private.h in Headers */, + 61A354550DF113C70076ECB1 /* SUUserInitiatedUpdateDriver.h in Headers */, + 61A2259E0D1C495D00430CCD /* SUVersionComparisonProtocol.h in Headers */, + 3772FEA913DE0B6B00F79537 /* SUVersionDisplayProtocol.h in Headers */, + 61180BCA0D64138900B4E0D1 /* SUWindowController.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ +/* Begin PBXLegacyTarget section */ + 1420DF491962329200203BB0 /* Documentation */ = { + isa = PBXLegacyTarget; + buildArgumentsString = "\"$(SRCROOT)/Documentation/build-docs.sh\" $(ACTION)"; + buildConfigurationList = 1420DF4A1962329200203BB0 /* Build configuration list for PBXLegacyTarget "Documentation" */; + buildPhases = ( + ); + buildToolPath = bash; + buildWorkingDirectory = ""; + dependencies = ( + ); + name = Documentation; + passBuildSettingsInEnvironment = 1; + productName = Documentation; + }; + 14732BC51960F69300593899 /* Distribution */ = { + isa = PBXLegacyTarget; + buildArgumentsString = "$(SRCROOT)/Configurations/make-release-package.sh $(ACTION)"; + buildConfigurationList = 14732BC61960F69300593899 /* Build configuration list for PBXLegacyTarget "Distribution" */; + buildPhases = ( + ); + buildToolPath = bash; + buildWorkingDirectory = ""; + dependencies = ( + 14732BCB1960F73500593899 /* PBXTargetDependency */, + 1454BA1619637EDB00344E57 /* PBXTargetDependency */, + 14732BCF1960F73500593899 /* PBXTargetDependency */, + 1454BA1819637EE900344E57 /* PBXTargetDependency */, + ); + name = Distribution; + passBuildSettingsInEnvironment = 1; + productName = Distribution; + }; +/* End PBXLegacyTarget section */ + /* Begin PBXNativeTarget section */ - 55C14BB6136EEF1500649790 /* finish_installation */ = { + 55C14BB6136EEF1500649790 /* Autoupdate */ = { isa = PBXNativeTarget; - buildConfigurationList = 55C14BBE136EEF1500649790 /* Build configuration list for PBXNativeTarget "finish_installation" */; + buildConfigurationList = 55C14BBE136EEF1500649790 /* Build configuration list for PBXNativeTarget "Autoupdate" */; buildPhases = ( 55C14BB3136EEF1500649790 /* Resources */, 55C14BB4136EEF1500649790 /* Sources */, @@ -819,9 +1015,9 @@ ); dependencies = ( ); - name = finish_installation; - productName = finish_installation; - productReference = 55C14BB7136EEF1500649790 /* finish_installation.app */; + name = Autoupdate; + productName = Autoupdate; + productReference = 55C14BB7136EEF1500649790 /* Autoupdate.app */; productType = "com.apple.product-type.application"; }; 5D06E8CF0FD68C7C005AE3F6 /* BinaryDelta */ = { @@ -858,8 +1054,8 @@ ); name = "Sparkle Unit Tests"; productName = "Sparkle Unit Tests"; - productReference = 612279D90DB5470200AB99EA /* Sparkle Unit Tests.octest */; - productType = "com.apple.product-type.bundle"; + productReference = 612279D90DB5470200AB99EA /* Sparkle Unit Tests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; }; 61B5F90109C4CEE200B25A18 /* Sparkle Test App */ = { isa = PBXNativeTarget; @@ -868,7 +1064,7 @@ 61B5F8FE09C4CEE200B25A18 /* Resources */, 61B5F8FF09C4CEE200B25A18 /* Sources */, 61B5F90009C4CEE200B25A18 /* Frameworks */, - 61B5FB4D09C4E9FA00B25A18 /* CopyFiles */, + 61B5FB4D09C4E9FA00B25A18 /* Copy Frameworks */, ); buildRules = ( ); @@ -909,7 +1105,14 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0450; + CLASSPREFIX = SU; + LastUpgradeCheck = 0600; + ORGANIZATIONNAME = "Sparkle Project"; + TargetAttributes = { + 612279D80DB5470200AB99EA = { + TestTargetID = 8DC2EF4F0486A6940098B216; + }; + }; }; buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Sparkle" */; compatibilityVersion = "Xcode 3.2"; @@ -955,6 +1158,8 @@ sl, uk, ar, + nb, + el, ); mainGroup = 0867D691FE84028FC02AAC07 /* Sparkle */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; @@ -965,7 +1170,10 @@ 61B5F90109C4CEE200B25A18 /* Sparkle Test App */, 612279D80DB5470200AB99EA /* Sparkle Unit Tests */, 5D06E8CF0FD68C7C005AE3F6 /* BinaryDelta */, - 55C14BB6136EEF1500649790 /* finish_installation */, + 55C14BB6136EEF1500649790 /* Autoupdate */, + 14732BC51960F69300593899 /* Distribution */, + 1420DF491962329200203BB0 /* Documentation */, + 1495005F195FB89400BC5B5B /* All */, ); }; /* End PBXProject section */ @@ -975,9 +1183,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 55C14BD9136EF00C00649790 /* SUStatus.xib in Resources */, + 1420DF51196247F900203BB0 /* Images.xcassets in Resources */, 55C14FC7136F05E100649790 /* Sparkle.strings in Resources */, - 550347011370023A00AE7681 /* Sparkle.icns in Resources */, + 55C14BD9136EF00C00649790 /* SUStatus.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -992,10 +1200,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 14732BC01960F2C200593899 /* test_app_only_dsa_pub.pem in Resources */, + 1420DF50196247F900203BB0 /* Images.xcassets in Resources */, 61B5F92E09C4CFD800B25A18 /* InfoPlist.strings in Resources */, - 61B5F92F09C4CFD800B25A18 /* MainMenu.nib in Resources */, - 61BBDF820A49220C00378739 /* Sparkle.icns in Resources */, - 618E9CFD0E7328F1004646D8 /* dsa_pub.pem in Resources */, + 61B5F92F09C4CFD800B25A18 /* MainMenu.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1003,15 +1211,13 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 61C2680A0E2DB5D000175E6C /* License.txt in Resources */, + 55C14F3B136EFCB300649790 /* Autoupdate.app in Resources */, 61AAE8280A321A7F00D8810D /* Sparkle.strings in Resources */, - 615AE3D00D64DC40001CA7BD /* SUModelTranslation.plist in Resources */, 55C14BEE136EF20D00649790 /* SUAutomaticUpdateAlert.xib in Resources */, + 615AE3D00D64DC40001CA7BD /* SUModelTranslation.plist in Resources */, 55C14BEF136EF21700649790 /* SUStatus.xib in Resources */, 55C14C04136EF26100649790 /* SUUpdateAlert.xib in Resources */, 55C14C19136EF2C700649790 /* SUUpdatePermissionPrompt.xib in Resources */, - 55C14F3B136EFCB300649790 /* finish_installation.app in Resources */, - 93FB277F156BD826001937C7 /* SUPasswordPrompt.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1068,13 +1274,16 @@ files = ( ); inputPaths = ( + "$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/Resources/fr.lproj", ); name = "Run Script: Link fr_CA to fr"; outputPaths = ( + "$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/Resources/fr_CA.lproj", ); runOnlyForDeploymentPostprocessing = 0; - shellPath = "/usr/bin/env ruby"; - shellScript = "resources = \"#{ENV[\"BUILT_PRODUCTS_DIR\"]}/#{ENV[\"WRAPPER_NAME\"]}/Resources\"\n`ln -sfh \"fr.lproj\" \"#{resources}/fr_CA.lproj\"`"; + shellPath = "/usr/bin/env sh"; + shellScript = "ln -sfh \"fr.lproj\" \"$BUILT_PRODUCTS_DIR/$WRAPPER_NAME/Resources/fr_CA.lproj\""; + showEnvVarsInLog = 0; }; 61E31A85103299750051D188 /* Run Script: Link pt to pt_BR */ = { isa = PBXShellScriptBuildPhase; @@ -1082,13 +1291,16 @@ files = ( ); inputPaths = ( + "$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/Resources/pt_BR.lproj", ); name = "Run Script: Link pt to pt_BR"; outputPaths = ( + "$(BUILT_PRODUCTS_DIR)/$(WRAPPER_NAME)/Resources/pt.lproj", ); runOnlyForDeploymentPostprocessing = 0; - shellPath = "/usr/bin/env ruby"; - shellScript = "resources = \"#{ENV[\"BUILT_PRODUCTS_DIR\"]}/#{ENV[\"WRAPPER_NAME\"]}/Resources\"\n`ln -sfh \"pt_BR.lproj\" \"#{resources}/pt.lproj\"`"; + shellPath = "/usr/bin/env sh"; + shellScript = "ln -sfh \"pt_BR.lproj\" \"$BUILT_PRODUCTS_DIR/$WRAPPER_NAME/Resources/pt.lproj\""; + showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -1097,18 +1309,18 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 55C14BD4136EEFCE00649790 /* finish_installation.m in Sources */, + 55C14BD4136EEFCE00649790 /* Autoupdate.m in Sources */, 55C14F00136EF6B700649790 /* SUConstants.m in Sources */, - 55C14F08136EF6DB00649790 /* SULog.m in Sources */, 55C14F0C136EF6EA00649790 /* SUHost.m in Sources */, 55C14F0D136EF6F200649790 /* SUInstaller.m in Sources */, - 55C14F20136EF84300649790 /* SUStatusController.m in Sources */, - 55C14F21136EF84D00649790 /* SUPlainInstaller.m in Sources */, - 55C14F22136EF86000649790 /* SUStandardVersionComparator.m in Sources */, - 55C14F23136EF86700649790 /* SUSystemProfiler.m in Sources */, + 55C14F08136EF6DB00649790 /* SULog.m in Sources */, 55C14F24136EF86F00649790 /* SUPackageInstaller.m in Sources */, - 55C14F2A136EF9A900649790 /* SUWindowController.m in Sources */, + 55C14F21136EF84D00649790 /* SUPlainInstaller.m in Sources */, 55C14F7E136F005000649790 /* SUPlainInstallerInternals.m in Sources */, + 55C14F22136EF86000649790 /* SUStandardVersionComparator.m in Sources */, + 55C14F20136EF84300649790 /* SUStatusController.m in Sources */, + 55C14F23136EF86700649790 /* SUSystemProfiler.m in Sources */, + 55C14F2A136EF9A900649790 /* SUWindowController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1125,6 +1337,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 5AF9DC3C1981DBEE001EA135 /* SUDSAVerifierTest.m in Sources */, + 14950075195FDF5900BC5B5B /* SUUpdaterTest.m in Sources */, 61227A160DB548B800AB99EA /* SUVersionComparisonTest.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1141,51 +1355,94 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 61B5F8EE09C4CE3C00B25A18 /* SUUpdater.m in Sources */, - 61B5F8EF09C4CE3C00B25A18 /* SUPlainInstallerInternals.m in Sources */, + 5D06E8EB0FD68CE4005AE3F6 /* bspatch.c in Sources */, + 610EC1E00CF3A5FE00AE239E /* NTSynchronousTask.m in Sources */, 61B5FBB709C4FAFF00B25A18 /* SUAppcast.m in Sources */, 61B5FC6F09C51F4900B25A18 /* SUAppcastItem.m in Sources */, - 61B5FCDE09C52A9F00B25A18 /* SUUpdateAlert.m in Sources */, - 6196CFFA09C72149000DC222 /* SUStatusController.m in Sources */, - 61299A3009CA2DAB00B7442F /* SUDSAVerifier.m in Sources */, - 61299A6009CA6EB100B7442F /* SUConstants.m in Sources */, - 61299A8E09CA790200B7442F /* SUUnarchiver.m in Sources */, 6120721309CC5C4B007FE0F6 /* SUAutomaticUpdateAlert.m in Sources */, - 610EC1E00CF3A5FE00AE239E /* NTSynchronousTask.m in Sources */, - 61A225A50D1C4AC000430CCD /* SUStandardVersionComparator.m in Sources */, - 61A2279D0D1CEE7600430CCD /* SUSystemProfiler.m in Sources */, - 612DCBB00D488BC60015DBEA /* SUUpdatePermissionPrompt.m in Sources */, - 61180BCB0D64138900B4E0D1 /* SUWindowController.m in Sources */, - 618FA5020DAE88B40026945C /* SUInstaller.m in Sources */, - 618FA5060DAE8AB80026945C /* SUPlainInstaller.m in Sources */, - 618FA5230DAE8E8A0026945C /* SUPackageInstaller.m in Sources */, - 61F83F720DBFE140006FDD30 /* SUBasicUpdateDriver.m in Sources */, - 61B93A3D0DD02D7000DCD2F8 /* SUUIBasedUpdateDriver.m in Sources */, 61B93B280DD0FDD300DCD2F8 /* SUAutomaticUpdateDriver.m in Sources */, - 61B93C0A0DD112FF00DCD2F8 /* SUScheduledUpdateDriver.m in Sources */, - 610134740DD250470049ACDF /* SUUpdateDriver.m in Sources */, - 6101347C0DD2541A0049ACDF /* SUProbingUpdateDriver.m in Sources */, - 61A354560DF113C70076ECB1 /* SUUserInitiatedUpdateDriver.m in Sources */, - 6102FE4B0E07803800F85D09 /* SUDiskImageUnarchiver.m in Sources */, - 6102FE5C0E08C7EC00F85D09 /* SUUnarchiver_Private.m in Sources */, - 61D85D6D0E10B2ED00F9B4A9 /* SUPipedUnarchiver.m in Sources */, - 61EF67560E25B58D00F754E0 /* SUHost.m in Sources */, - 5D06E8EB0FD68CE4005AE3F6 /* bspatch.c in Sources */, + 61F83F720DBFE140006FDD30 /* SUBasicUpdateDriver.m in Sources */, 5D06E8EC0FD68CE4005AE3F6 /* SUBinaryDeltaApply.m in Sources */, 5D06E8ED0FD68CE4005AE3F6 /* SUBinaryDeltaCommon.m in Sources */, 5D06E93A0FD69271005AE3F6 /* SUBinaryDeltaUnarchiver.m in Sources */, - 55C14F07136EF6DB00649790 /* SULog.m in Sources */, - 93FB277B156BD80D001937C7 /* SUPasswordPrompt.m in Sources */, 61B078CF15A5FB6100600039 /* SUCodeSigningVerifier.m in Sources */, + 61299A6009CA6EB100B7442F /* SUConstants.m in Sources */, + 6102FE4B0E07803800F85D09 /* SUDiskImageUnarchiver.m in Sources */, + 61299A3009CA2DAB00B7442F /* SUDSAVerifier.m in Sources */, + 61EF67560E25B58D00F754E0 /* SUHost.m in Sources */, + 618FA5020DAE88B40026945C /* SUInstaller.m in Sources */, + 55C14F07136EF6DB00649790 /* SULog.m in Sources */, + 618FA5230DAE8E8A0026945C /* SUPackageInstaller.m in Sources */, + 61D85D6D0E10B2ED00F9B4A9 /* SUPipedUnarchiver.m in Sources */, + 618FA5060DAE8AB80026945C /* SUPlainInstaller.m in Sources */, + 61B5F8EF09C4CE3C00B25A18 /* SUPlainInstallerInternals.m in Sources */, + 6101347C0DD2541A0049ACDF /* SUProbingUpdateDriver.m in Sources */, + 61B93C0A0DD112FF00DCD2F8 /* SUScheduledUpdateDriver.m in Sources */, + 61A225A50D1C4AC000430CCD /* SUStandardVersionComparator.m in Sources */, + 6196CFFA09C72149000DC222 /* SUStatusController.m in Sources */, + 61A2279D0D1CEE7600430CCD /* SUSystemProfiler.m in Sources */, + 61B93A3D0DD02D7000DCD2F8 /* SUUIBasedUpdateDriver.m in Sources */, + 61299A8E09CA790200B7442F /* SUUnarchiver.m in Sources */, + 61B5FCDE09C52A9F00B25A18 /* SUUpdateAlert.m in Sources */, + 610134740DD250470049ACDF /* SUUpdateDriver.m in Sources */, + 612DCBB00D488BC60015DBEA /* SUUpdatePermissionPrompt.m in Sources */, + 61B5F8EE09C4CE3C00B25A18 /* SUUpdater.m in Sources */, + 61A354560DF113C70076ECB1 /* SUUserInitiatedUpdateDriver.m in Sources */, + 61180BCB0D64138900B4E0D1 /* SUWindowController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 1454BA1619637EDB00344E57 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 61B5F90109C4CEE200B25A18 /* Sparkle Test App */; + targetProxy = 1454BA1519637EDB00344E57 /* PBXContainerItemProxy */; + }; + 1454BA1819637EE900344E57 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 1420DF491962329200203BB0 /* Documentation */; + targetProxy = 1454BA1719637EE900344E57 /* PBXContainerItemProxy */; + }; + 14732BCB1960F73500593899 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 8DC2EF4F0486A6940098B216 /* Sparkle */; + targetProxy = 14732BCA1960F73500593899 /* PBXContainerItemProxy */; + }; + 14732BCF1960F73500593899 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5D06E8CF0FD68C7C005AE3F6 /* BinaryDelta */; + targetProxy = 14732BCE1960F73500593899 /* PBXContainerItemProxy */; + }; + 14950064195FB8A600BC5B5B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 8DC2EF4F0486A6940098B216 /* Sparkle */; + targetProxy = 14950063195FB8A600BC5B5B /* PBXContainerItemProxy */; + }; + 14950066195FB8A600BC5B5B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 61B5F90109C4CEE200B25A18 /* Sparkle Test App */; + targetProxy = 14950065195FB8A600BC5B5B /* PBXContainerItemProxy */; + }; + 14950068195FB8A600BC5B5B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 612279D80DB5470200AB99EA /* Sparkle Unit Tests */; + targetProxy = 14950067195FB8A600BC5B5B /* PBXContainerItemProxy */; + }; + 1495006A195FB8A600BC5B5B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5D06E8CF0FD68C7C005AE3F6 /* BinaryDelta */; + targetProxy = 14950069195FB8A600BC5B5B /* PBXContainerItemProxy */; + }; + 1495006C195FB8A600BC5B5B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 55C14BB6136EEF1500649790 /* Autoupdate */; + targetProxy = 1495006B195FB8A600BC5B5B /* PBXContainerItemProxy */; + }; 55C14F97136F044100649790 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 55C14BB6136EEF1500649790 /* finish_installation */; + target = 55C14BB6136EEF1500649790 /* Autoupdate */; targetProxy = 55C14F96136F044100649790 /* PBXContainerItemProxy */; }; 5D06E8D60FD68C86005AE3F6 /* PBXTargetDependency */ = { @@ -1209,9 +1466,11 @@ 55C14BDA136EF20D00649790 /* SUAutomaticUpdateAlert.xib */ = { isa = PBXVariantGroup; children = ( + 6149E6ED1601ABAC008A351E /* ar */, 55C14BDB136EF20D00649790 /* cs */, 55C14BDC136EF20D00649790 /* da */, 55C14BDD136EF20D00649790 /* de */, + 555CF29B196C523E0000B31E /* el */, 55C14BDE136EF20D00649790 /* en */, 55C14BDF136EF20D00649790 /* es */, 55C14BE0136EF20D00649790 /* fr */, @@ -1219,21 +1478,21 @@ 55C14BE2136EF20D00649790 /* it */, 55C14BE3136EF20D00649790 /* ja */, 55C14BE4136EF20D00649790 /* ko */, + 4607BEA31948443800EF8DA4 /* nb */, 55C14BE5136EF20D00649790 /* nl */, 55C14BE6136EF20D00649790 /* pl */, 55C14BE7136EF20D00649790 /* pt_BR */, + 6158A1BA1378F68100487EC1 /* pt_PT */, + 004A8653192A492B00C9730D /* ro */, 55C14BE9136EF20D00649790 /* ru */, 55C14BEA136EF20D00649790 /* sk */, + 61BA66DA14BDFC5500D02D86 /* sl */, 55C14BEB136EF20D00649790 /* sv */, + 61F3AC1415C22D5900260CA2 /* th */, + 6158A1BE1378F8BB00487EC1 /* tr */, + 0263187514FEBB42005EBF43 /* uk */, 55C14BEC136EF20D00649790 /* zh_CN */, 55C14BED136EF20D00649790 /* zh_TW */, - 6158A1BA1378F68100487EC1 /* pt_PT */, - 6158A1BE1378F8BB00487EC1 /* tr */, - 61DEC11C1477568300931268 /* ro */, - 61BA66DA14BDFC5500D02D86 /* sl */, - 0263187514FEBB42005EBF43 /* uk */, - 61F3AC1415C22D5900260CA2 /* th */, - 6149E6ED1601ABAC008A351E /* ar */, ); name = SUAutomaticUpdateAlert.xib; sourceTree = ""; @@ -1241,9 +1500,11 @@ 55C14BF0136EF26100649790 /* SUUpdateAlert.xib */ = { isa = PBXVariantGroup; children = ( + 6149E6EF1601ABAC008A351E /* ar */, 55C14BF1136EF26100649790 /* cs */, 55C14BF2136EF26100649790 /* da */, 55C14BF3136EF26100649790 /* de */, + 555CF29C196C52460000B31E /* el */, 55C14BF4136EF26100649790 /* en */, 55C14BF5136EF26100649790 /* es */, 55C14BF6136EF26100649790 /* fr */, @@ -1251,21 +1512,21 @@ 55C14BF8136EF26100649790 /* it */, 55C14BF9136EF26100649790 /* ja */, 55C14BFA136EF26100649790 /* ko */, + 4607BEA41948443800EF8DA4 /* nb */, 55C14BFB136EF26100649790 /* nl */, 55C14BFC136EF26100649790 /* pl */, 55C14BFD136EF26100649790 /* pt_BR */, + 6158A1BB1378F68100487EC1 /* pt_PT */, + 004A8654192A492B00C9730D /* ro */, 55C14BFF136EF26100649790 /* ru */, 55C14C00136EF26100649790 /* sk */, + 61BA66DB14BDFC5500D02D86 /* sl */, 55C14C01136EF26100649790 /* sv */, + 61F3AC1615C22D5900260CA2 /* th */, + 6158A1BF1378F8BB00487EC1 /* tr */, + 0263187614FEBB42005EBF43 /* uk */, 55C14C02136EF26100649790 /* zh_CN */, 55C14C03136EF26100649790 /* zh_TW */, - 6158A1BB1378F68100487EC1 /* pt_PT */, - 6158A1BF1378F8BB00487EC1 /* tr */, - 61DEC11A1477567800931268 /* ro */, - 61BA66DB14BDFC5500D02D86 /* sl */, - 0263187614FEBB42005EBF43 /* uk */, - 61F3AC1615C22D5900260CA2 /* th */, - 6149E6EF1601ABAC008A351E /* ar */, ); name = SUUpdateAlert.xib; sourceTree = ""; @@ -1273,9 +1534,11 @@ 55C14C05136EF2C700649790 /* SUUpdatePermissionPrompt.xib */ = { isa = PBXVariantGroup; children = ( + 6149E6F01601ABAC008A351E /* ar */, 55C14C06136EF2C700649790 /* cs */, 55C14C07136EF2C700649790 /* da */, 55C14C08136EF2C700649790 /* de */, + 555CF29D196C524C0000B31E /* el */, 55C14C09136EF2C700649790 /* en */, 55C14C0A136EF2C700649790 /* es */, 55C14C0B136EF2C700649790 /* fr */, @@ -1283,21 +1546,21 @@ 55C14C0D136EF2C700649790 /* it */, 55C14C0E136EF2C700649790 /* ja */, 55C14C0F136EF2C700649790 /* ko */, + 4607BEA51948443800EF8DA4 /* nb */, 55C14C10136EF2C700649790 /* nl */, 55C14C11136EF2C700649790 /* pl */, 55C14C12136EF2C700649790 /* pt_BR */, + 6158A1B81378F64700487EC1 /* pt_PT */, + 004A8655192A492B00C9730D /* ro */, 55C14C14136EF2C700649790 /* ru */, 55C14C15136EF2C700649790 /* sk */, + 61BA66DC14BDFC5500D02D86 /* sl */, 55C14C16136EF2C700649790 /* sv */, + 61F3AC1715C22D5900260CA2 /* th */, + 6158A1C01378F8BB00487EC1 /* tr */, + 0263187714FEBB42005EBF43 /* uk */, 55C14C17136EF2C700649790 /* zh_CN */, 55C14C18136EF2C700649790 /* zh_TW */, - 6158A1B81378F64700487EC1 /* pt_PT */, - 6158A1C01378F8BB00487EC1 /* tr */, - 61DEC1181477566800931268 /* ro */, - 61BA66DC14BDFC5500D02D86 /* sl */, - 0263187714FEBB42005EBF43 /* uk */, - 61F3AC1715C22D5900260CA2 /* th */, - 6149E6F01601ABAC008A351E /* ar */, ); name = SUUpdatePermissionPrompt.xib; sourceTree = ""; @@ -1305,29 +1568,33 @@ 61AAE8220A321A7F00D8810D /* Sparkle.strings */ = { isa = PBXVariantGroup; children = ( + 6149E6EA1601ABAC008A351E /* ar */, + 615409C4103BBC4000125AF1 /* cs */, + 61131A050F846CE600E97AF6 /* da */, + 619B17200E1E9D0800E72754 /* de */, + 555CF29A196C52330000B31E /* el */, 61AAE8230A321A7F00D8810D /* en */, 61AAE84F0A321AF700D8810D /* es */, 61AAE8590A321B0400D8810D /* fr */, - 61AAE8710A321F7700D8810D /* nl */, - 619B17200E1E9D0800E72754 /* de */, + 613151B20FB4946A000DCD59 /* is */, 61F614540E24A12D009F47E7 /* it */, - 618915730E35937600B5E981 /* sv */, + 611A904610240DF700CC659E /* ja */, + FE5536F517A2C6A7007CB333 /* ko */, + 4607BEA21948443800EF8DA4 /* nb */, + 61AAE8710A321F7700D8810D /* nl */, + 611A904210240DD300CC659E /* pl */, + 61E31A80103299500051D188 /* pt_BR */, + 6186554310D7484E00B1E074 /* pt_PT */, + 004A8652192A492B00C9730D /* ro */, 6195D4920E404AD700D41A50 /* ru */, - 61131A050F846CE600E97AF6 /* da */, + FE5536F617A2C6AB007CB333 /* sk */, + 61BA66CC14BDFA0400D02D86 /* sl */, + 618915730E35937600B5E981 /* sv */, + 61F3AC1215C22D4A00260CA2 /* th */, + 5AEF45D9189D1CC90030D7DC /* tr */, + 0263187214FEBB31005EBF43 /* uk */, 61131A090F846D0A00E97AF6 /* zh_CN */, 61131A0A0F846D1100E97AF6 /* zh_TW */, - 613151B20FB4946A000DCD59 /* is */, - 611A904210240DD300CC659E /* pl */, - 611A904610240DF700CC659E /* ja */, - 61E31A80103299500051D188 /* pt_BR */, - 615409C4103BBC4000125AF1 /* cs */, - 6186554310D7484E00B1E074 /* pt_PT */, - 6160FD85134ABCD5007FFC5F /* tr */, - 61DEC1161477565C00931268 /* ro */, - 61BA66CC14BDFA0400D02D86 /* sl */, - 0263187214FEBB31005EBF43 /* uk */, - 61F3AC1215C22D4A00260CA2 /* th */, - 6149E6EA1601ABAC008A351E /* ar */, ); name = Sparkle.strings; sourceTree = ""; @@ -1340,35 +1607,59 @@ name = InfoPlist.strings; sourceTree = ""; }; - 61B5F92C09C4CFD800B25A18 /* MainMenu.nib */ = { + 61B5F92C09C4CFD800B25A18 /* MainMenu.xib */ = { isa = PBXVariantGroup; children = ( 61B5F92D09C4CFD800B25A18 /* English */, ); - name = MainMenu.nib; - sourceTree = ""; - }; - 93FB277D156BD826001937C7 /* SUPasswordPrompt.xib */ = { - isa = PBXVariantGroup; - children = ( - 93FB277E156BD826001937C7 /* en */, - 6113C9D315BE1D3600C303E7 /* pt_BR */, - 61F3AC1515C22D5900260CA2 /* th */, - 6149E6EE1601ABAC008A351E /* ar */, - 61B26BF817B2F76600F99C77 /* da */, - ); - name = SUPasswordPrompt.xib; + name = MainMenu.xib; sourceTree = ""; }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 1420DF4B1962329200203BB0 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Debug; + }; + 1420DF4C1962329200203BB0 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Release; + }; + 14732BC71960F69300593899 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Debug; + }; + 14732BC81960F69300593899 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Release; + }; + 14950061195FB89500BC5B5B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 14950062195FB89500BC5B5B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; 1DEB91AE08733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - SDKROOT = macosx; }; name = Debug; }; @@ -1376,26 +1667,21 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA1941D50D94A70100DD942E /* ConfigFrameworkRelease.xcconfig */; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - SDKROOT = macosx; }; name = Release; }; 1DEB91B208733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = FA1941CF0D94A70100DD942E /* ConfigCommonDebug.xcconfig */; buildSettings = { - MACOSX_DEPLOYMENT_TARGET = 10.7; - SDKROOT = macosx; - SKIP_INSTALL = YES; + ONLY_ACTIVE_ARCH = YES; }; name = Debug; }; 1DEB91B308733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = FA1941CC0D94A70100DD942E /* ConfigCommonRelease.xcconfig */; buildSettings = { - MACOSX_DEPLOYMENT_TARGET = 10.7; - SDKROOT = macosx; - SKIP_INSTALL = YES; }; name = Release; }; @@ -1403,24 +1689,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA1941D30D94A70100DD942E /* ConfigRelaunchDebug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = finish_installation.pch; - INFOPLIST_FILE = "finish_installation-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PRODUCT_NAME = finish_installation; - SDKROOT = macosx; }; name = Debug; }; @@ -1428,54 +1696,13 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA1941D40D94A70100DD942E /* ConfigRelaunchRelease.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = finish_installation.pch; - INFOPLIST_FILE = "finish_installation-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PRODUCT_NAME = finish_installation; - SDKROOT = macosx; - ZERO_LINK = NO; }; name = Release; }; - 55C14BBD136EEF1500649790 /* Release (GC dual-mode; 10.5+) */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = FA1941D40D94A70100DD942E /* ConfigRelaunchRelease.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COMBINE_HIDPI_IMAGES = YES; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = finish_installation.pch; - INFOPLIST_FILE = "finish_installation-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PRODUCT_NAME = finish_installation; - SDKROOT = macosx; - }; - name = "Release (GC dual-mode; 10.5+)"; - }; 5D06E8D20FD68C7D005AE3F6 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 5D06E8F20FD68D21005AE3F6 /* ConfigBinaryDeltaDebug.xcconfig */; buildSettings = { - SDKROOT = macosx; }; name = Debug; }; @@ -1483,60 +1710,19 @@ isa = XCBuildConfiguration; baseConfigurationReference = 5D06E8F30FD68D21005AE3F6 /* ConfigBinaryDeltaRelease.xcconfig */; buildSettings = { - SDKROOT = macosx; }; name = Release; }; - 5D06E8D40FD68C7D005AE3F6 /* Release (GC dual-mode; 10.5+) */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 5D06E8F30FD68D21005AE3F6 /* ConfigBinaryDeltaRelease.xcconfig */; - buildSettings = { - SDKROOT = macosx; - }; - name = "Release (GC dual-mode; 10.5+)"; - }; - 61072EAD0DF263BD008FE88B /* Release (GC dual-mode; 10.5+) */ = { - isa = XCBuildConfiguration; - buildSettings = { - MACOSX_DEPLOYMENT_TARGET = 10.7; - SDKROOT = macosx; - SKIP_INSTALL = YES; - }; - name = "Release (GC dual-mode; 10.5+)"; - }; - 61072EAE0DF263BD008FE88B /* Release (GC dual-mode; 10.5+) */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 61072EB20DF2640C008FE88B /* ConfigFrameworkReleaseGCSupport.xcconfig */; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - SDKROOT = macosx; - }; - name = "Release (GC dual-mode; 10.5+)"; - }; - 61072EAF0DF263BD008FE88B /* Release (GC dual-mode; 10.5+) */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 615409A8103BA09100125AF1 /* ConfigTestAppReleaseGCSupport.xcconfig */; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - SDKROOT = macosx; - }; - name = "Release (GC dual-mode; 10.5+)"; - }; - 61072EB10DF263BD008FE88B /* Release (GC dual-mode; 10.5+) */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = FA302AFD109D13190060F891 /* ConfigUnitTestReleaseGCSupport.xcconfig */; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - SDKROOT = macosx; - }; - name = "Release (GC dual-mode; 10.5+)"; - }; 612279DB0DB5470300AB99EA /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = FA3AAF3A1050B273004B3130 /* ConfigUnitTestDebug.xcconfig */; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - SDKROOT = macosx; + BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Sparkle.framework/Versions/A/Sparkle"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(DEVELOPER_FRAMEWORKS_DIR)", + ); + TEST_HOST = "$(BUNDLE_LOADER)"; }; name = Debug; }; @@ -1544,8 +1730,12 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA3AAF391050B273004B3130 /* ConfigUnitTestRelease.xcconfig */; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - SDKROOT = macosx; + BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/Sparkle.framework/Versions/A/Sparkle"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(DEVELOPER_FRAMEWORKS_DIR)", + ); + TEST_HOST = "$(BUNDLE_LOADER)"; }; name = Release; }; @@ -1553,8 +1743,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA1941CB0D94A70100DD942E /* ConfigTestAppDebug.xcconfig */; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - SDKROOT = macosx; }; name = Debug; }; @@ -1562,20 +1750,44 @@ isa = XCBuildConfiguration; baseConfigurationReference = FA1941D20D94A70100DD942E /* ConfigTestAppRelease.xcconfig */; buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - SDKROOT = macosx; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 1420DF4A1962329200203BB0 /* Build configuration list for PBXLegacyTarget "Documentation" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1420DF4B1962329200203BB0 /* Debug */, + 1420DF4C1962329200203BB0 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 14732BC61960F69300593899 /* Build configuration list for PBXLegacyTarget "Distribution" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 14732BC71960F69300593899 /* Debug */, + 14732BC81960F69300593899 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 14950060195FB89500BC5B5B /* Build configuration list for PBXAggregateTarget "All" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 14950061195FB89500BC5B5B /* Debug */, + 14950062195FB89500BC5B5B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Sparkle" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91AE08733DA50010E9CD /* Debug */, 1DEB91AF08733DA50010E9CD /* Release */, - 61072EAE0DF263BD008FE88B /* Release (GC dual-mode; 10.5+) */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1585,17 +1797,15 @@ buildConfigurations = ( 1DEB91B208733DA50010E9CD /* Debug */, 1DEB91B308733DA50010E9CD /* Release */, - 61072EAD0DF263BD008FE88B /* Release (GC dual-mode; 10.5+) */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 55C14BBE136EEF1500649790 /* Build configuration list for PBXNativeTarget "finish_installation" */ = { + 55C14BBE136EEF1500649790 /* Build configuration list for PBXNativeTarget "Autoupdate" */ = { isa = XCConfigurationList; buildConfigurations = ( 55C14BBB136EEF1500649790 /* Debug */, 55C14BBC136EEF1500649790 /* Release */, - 55C14BBD136EEF1500649790 /* Release (GC dual-mode; 10.5+) */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1605,7 +1815,6 @@ buildConfigurations = ( 5D06E8D20FD68C7D005AE3F6 /* Debug */, 5D06E8D30FD68C7D005AE3F6 /* Release */, - 5D06E8D40FD68C7D005AE3F6 /* Release (GC dual-mode; 10.5+) */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1615,7 +1824,6 @@ buildConfigurations = ( 612279DB0DB5470300AB99EA /* Debug */, 612279DC0DB5470300AB99EA /* Release */, - 61072EB10DF263BD008FE88B /* Release (GC dual-mode; 10.5+) */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1625,7 +1833,6 @@ buildConfigurations = ( 61B5F90609C4CEE300B25A18 /* Debug */, 61B5F90709C4CEE300B25A18 /* Release */, - 61072EAF0DF263BD008FE88B /* Release (GC dual-mode; 10.5+) */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Frameworks/Sparkle/Sparkle.xcodeproj/xcshareddata/xcschemes/Sparkle.xcscheme b/Frameworks/Sparkle/Sparkle.xcodeproj/xcshareddata/xcschemes/Sparkle.xcscheme index 25e654436..073a79fe0 100644 --- a/Frameworks/Sparkle/Sparkle.xcodeproj/xcshareddata/xcschemes/Sparkle.xcscheme +++ b/Frameworks/Sparkle/Sparkle.xcodeproj/xcshareddata/xcschemes/Sparkle.xcscheme @@ -1,7 +1,7 @@ + LastUpgradeVersion = "0600" + version = "2.0"> @@ -20,34 +20,6 @@ ReferencedContainer = "container:Sparkle.xcodeproj"> - - - - - - - - @@ -70,31 +42,32 @@ - + - + @@ -103,8 +76,16 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" buildConfiguration = "Release" - ignoresPersistentStateOnLaunch = "YES" debugDocumentVersioning = "YES"> + + + + diff --git a/Frameworks/Sparkle/Sparkle/Autoupdate/Autoupdate-Info.plist b/Frameworks/Sparkle/Sparkle/Autoupdate/Autoupdate-Info.plist new file mode 100644 index 000000000..dee39c1bf --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/Autoupdate/Autoupdate-Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + org.sparkle-project.Sparkle.${PRODUCT_NAME:rfc1034identifier} + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + CFBundleShortVersionString + ${CURRENT_PROJECT_VERSION} + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + LSBackgroundOnly + 1 + LSMinimumSystemVersion + ${MACOSX_DEPLOYMENT_TARGET} + LSUIElement + 1 + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/Frameworks/Sparkle/Sparkle/Autoupdate/Autoupdate.m b/Frameworks/Sparkle/Sparkle/Autoupdate/Autoupdate.m new file mode 100644 index 000000000..fa65de138 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/Autoupdate/Autoupdate.m @@ -0,0 +1,223 @@ +#import +#import "SUInstaller.h" +#import "SUHost.h" +#import "SUStandardVersionComparator.h" +#import "SUStatusController.h" +#import "SUPlainInstallerInternals.h" +#import "SULog.h" + +#include + +/*! + * If the Installation takes longer than this time the Application Icon is shown in the Dock so that the user has some feedback. + */ +static const NSTimeInterval SUInstallationTimeLimit = 5; + +/*! + * Time this app uses to recheck if the parent has already died. + */ +static const NSTimeInterval SUParentQuitCheckInterval = .25; + +@interface TerminationListener : NSObject + +@property (assign) const char *hostpath; +@property (assign) const char *executablepath; +@property (assign) pid_t parentprocessid; +@property (assign) const char *folderpath; + +@property (copy) NSString *selfPath; +@property (copy) NSString *installationPath; +@property (strong) NSTimer *watchdogTimer; +@property (strong) NSTimer *longInstallationTimer; +@property (strong) SUHost *host; +@property (assign) BOOL shouldRelaunch; +@property (assign) BOOL shouldShowUI; + +- (void)parentHasQuit; + +- (void)relaunch; +- (void)install; + +- (void)showAppIconInDock:(NSTimer *)aTimer; +- (void)watchdog:(NSTimer *)aTimer; + +@end + +@implementation TerminationListener + +@synthesize hostpath; +@synthesize executablepath; +@synthesize parentprocessid; +@synthesize folderpath; + +@synthesize selfPath; +@synthesize installationPath; +@synthesize watchdogTimer; +@synthesize longInstallationTimer; +@synthesize host; +@synthesize shouldRelaunch; +@synthesize shouldShowUI; + +- (instancetype)initWithHostPath:(const char *)inhostpath executablePath:(const char *)execpath parentProcessId:(pid_t)ppid folderPath:(const char *)infolderpath shouldRelaunch:(BOOL)relaunch shouldShowUI:(BOOL)showUI selfPath:(NSString *)inSelfPath +{ + if (!(self = [super init])) { + return nil; + } + + hostpath = inhostpath; + executablepath = execpath; + parentprocessid = ppid; + folderpath = infolderpath; + selfPath = inSelfPath; + shouldRelaunch = relaunch; + shouldShowUI = showUI; + + BOOL alreadyTerminated = (getppid() == 1); // ppid is launchd (1) => parent terminated already + + if (alreadyTerminated) + [self parentHasQuit]; + else + watchdogTimer = [NSTimer scheduledTimerWithTimeInterval:SUParentQuitCheckInterval target:self selector:@selector(watchdog:) userInfo:nil repeats:YES]; + + return self; +} + + +- (void)dealloc +{ + [longInstallationTimer invalidate]; +} + + +- (void)parentHasQuit +{ + [self.watchdogTimer invalidate]; + self.longInstallationTimer = [NSTimer scheduledTimerWithTimeInterval:SUInstallationTimeLimit + target: self selector: @selector(showAppIconInDock:) + userInfo:nil repeats:NO]; + + if (self.folderpath) + [self install]; + else + [self relaunch]; +} + +- (void)watchdog:(NSTimer *)__unused aTimer +{ + if (![NSRunningApplication runningApplicationWithProcessIdentifier:self.parentprocessid]) { + [self parentHasQuit]; + } +} + +- (void)showAppIconInDock:(NSTimer *)__unused aTimer +{ + ProcessSerialNumber psn = { 0, kCurrentProcess }; + TransformProcessType(&psn, kProcessTransformToForegroundApplication); +} + + +- (void)relaunch __attribute__((noreturn)) +{ + if (self.shouldRelaunch) + { + NSString *appPath = nil; + if (!self.folderpath || strcmp(self.executablepath, self.hostpath) != 0) + appPath = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:self.executablepath length:strlen(self.executablepath)]; + else + appPath = self.installationPath; + [[NSWorkspace sharedWorkspace] openFile:appPath]; + } + + if (self.folderpath) + { + NSError *theError = nil; + if (![SUPlainInstaller _removeFileAtPath:[SUInstaller updateFolder] error:&theError]) + SULog(@"Couldn't remove update folder: %@.", theError); + } + [[NSFileManager defaultManager] removeItemAtPath:self.selfPath error:NULL]; + + exit(EXIT_SUCCESS); +} + + +- (void)install +{ + NSBundle *theBundle = [NSBundle bundleWithPath:[[NSFileManager defaultManager] stringWithFileSystemRepresentation:self.hostpath length:strlen(self.hostpath)]]; + self.host = [[SUHost alloc] initWithBundle:theBundle]; + self.installationPath = [[self.host installationPath] copy]; + + if (self.shouldShowUI) { + SUStatusController *statusCtl = [[SUStatusController alloc] initWithHost:self.host]; // We quit anyway after we've installed, so leak this for now. + [statusCtl setButtonTitle:SULocalizedString(@"Cancel Update", @"") target:nil action:Nil isDefault:NO]; + [statusCtl beginActionWithTitle:SULocalizedString(@"Installing update...", @"") + maxProgressValue: 0 statusText: @""]; + [statusCtl showWindow:self]; + } + + [SUInstaller installFromUpdateFolder:[[NSFileManager defaultManager] stringWithFileSystemRepresentation:self.folderpath length:strlen(self.folderpath)] + overHost:self.host + installationPath:self.installationPath + delegate:self + versionComparator:[SUStandardVersionComparator defaultComparator]]; +} + +- (void)installerFinishedForHost:(SUHost *)__unused aHost +{ + [self relaunch]; +} + +- (void)installerForHost:(SUHost *)__unused host failedWithError:(NSError *)error __attribute__((noreturn)) +{ + if (self.shouldShowUI) + NSRunAlertPanel(@"", @"%@", @"OK", @"", @"", [error localizedDescription]); + exit(EXIT_FAILURE); +} + +@end + +int main(int argc, const char *argv[]) +{ + if (argc < 5 || argc > 7) { + return EXIT_FAILURE; + } + + @autoreleasepool { +//ProcessSerialNumber psn = { 0, kCurrentProcess }; +//TransformProcessType( &psn, kProcessTransformToForegroundApplication ); + +#if 0 // Cmdline tool + NSString* selfPath = nil; + if (argv[0][0] == '/') { + selfPath = [[NSFileManager defaultManager] stringWithFileSystemRepresentation: argv[0] length: strlen(argv[0])]; + } + else + { + selfPath = [[NSFileManager defaultManager] currentDirectoryPath]; + selfPath = [selfPath stringByAppendingPathComponent: [[NSFileManager defaultManager] stringWithFileSystemRepresentation: argv[0] length: strlen(argv[0])]]; + } +#else + NSString *selfPath = [[NSBundle mainBundle] bundlePath]; +#endif + + BOOL shouldShowUI = (argc > 6) ? !!atoi(argv[6]) : YES; + if (shouldShowUI) + { + [[NSApplication sharedApplication] activateIgnoringOtherApps:YES]; + } + + [NSApplication sharedApplication]; + TerminationListener *termListen = [[TerminationListener alloc] initWithHostPath:(argc > 1) ? argv[1] : NULL + executablePath:(argc > 2) ? argv[2] : NULL + parentProcessId:(argc > 3) ? atoi(argv[3]) : 0 + folderPath:(argc > 4) ? argv[4] : NULL + shouldRelaunch:(argc > 5) ? !!atoi(argv[5]) : YES + shouldShowUI:shouldShowUI + selfPath:selfPath]; + + [termListen class]; + [[NSApplication sharedApplication] run]; + + } + + return EXIT_SUCCESS; +} diff --git a/Frameworks/Sparkle/Sparkle/Autoupdate/Autoupdate.pch b/Frameworks/Sparkle/Sparkle/Autoupdate/Autoupdate.pch new file mode 100644 index 000000000..f29230f16 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/Autoupdate/Autoupdate.pch @@ -0,0 +1,16 @@ +// +// Sparkle.pch +// Sparkle +// +// Created by Andy Matuschak on 7/23/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#define SPARKLE_BUNDLE [NSBundle mainBundle] +#define SULocalizedString(key,comment) NSLocalizedStringFromTableInBundle(key, @"Sparkle", SPARKLE_BUNDLE, comment) +#define SUAbstractFail() NSAssert2(nil, @"Can't call %@ on an instance of %@; this is an abstract method!", __PRETTY_FUNCTION__, [self class]); + +#ifdef __OBJC__ +#import +#import "SUConstants.h" +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUAppcast.h b/Frameworks/Sparkle/Sparkle/SUAppcast.h new file mode 100644 index 000000000..702f549e1 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUAppcast.h @@ -0,0 +1,30 @@ +// +// SUAppcast.h +// Sparkle +// +// Created by Andy Matuschak on 3/12/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUAPPCAST_H +#define SUAPPCAST_H + +@protocol SUAppcastDelegate; + +@class SUAppcastItem; +@interface SUAppcast : NSObject + +@property (weak) id delegate; +@property (copy) NSString *userAgentString; + +- (void)fetchAppcastFromURL:(NSURL *)url; + +@property (readonly, copy) NSArray *items; +@end + +@protocol SUAppcastDelegate +- (void)appcastDidFinishLoading:(SUAppcast *)appcast; +- (void)appcast:(SUAppcast *)appcast failedToLoadWithError:(NSError *)error; +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUAppcast.m b/Frameworks/Sparkle/Sparkle/SUAppcast.m new file mode 100644 index 000000000..bc35b40ff --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUAppcast.m @@ -0,0 +1,261 @@ +// +// SUAppcast.m +// Sparkle +// +// Created by Andy Matuschak on 3/12/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#import "SUUpdater.h" + +#import "SUAppcast.h" +#import "SUAppcastItem.h" +#import "SUVersionComparisonProtocol.h" +#import "SUAppcast.h" +#import "SUConstants.h" +#import "SULog.h" + +@interface NSXMLElement (SUAppcastExtensions) +@property (readonly, copy) NSDictionary *attributesAsDictionary; +@end + +@implementation NSXMLElement (SUAppcastExtensions) +- (NSDictionary *)attributesAsDictionary +{ + NSEnumerator *attributeEnum = [[self attributes] objectEnumerator]; + NSMutableDictionary *dictionary = [NSMutableDictionary dictionary]; + + for (NSXMLNode *attribute in attributeEnum) { + dictionary[[attribute name]] = [attribute stringValue]; + } + return dictionary; +} +@end + +@interface SUAppcast () +@property (copy) NSString *downloadFilename; +@property (strong) NSURLDownload *download; +@property (copy) NSArray *items; +- (void)reportError:(NSError *)error; +- (NSXMLNode *)bestNodeInNodes:(NSArray *)nodes; +@end + +@implementation SUAppcast + +@synthesize downloadFilename; +@synthesize delegate; +@synthesize userAgentString; +@synthesize download; +@synthesize items; + +- (void)fetchAppcastFromURL:(NSURL *)url +{ + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30.0]; + if (self.userAgentString) { + [request setValue:self.userAgentString forHTTPHeaderField:@"User-Agent"]; + } + + [request setValue:@"application/rss+xml,*/*;q=0.1" forHTTPHeaderField:@"Accept"]; + + self.download = [[NSURLDownload alloc] initWithRequest:request delegate:self]; +} + +- (void)download:(NSURLDownload *)__unused aDownload decideDestinationWithSuggestedFilename:(NSString *)filename +{ + NSString *destinationFilename = NSTemporaryDirectory(); + if (destinationFilename) + { + destinationFilename = [destinationFilename stringByAppendingPathComponent:filename]; + [self.download setDestination:destinationFilename allowOverwrite:NO]; + } +} + +- (void)download:(NSURLDownload *)__unused aDownload didCreateDestination:(NSString *)path +{ + self.downloadFilename = path; +} + +- (void)downloadDidFinish:(NSURLDownload *)__unused aDownload +{ + NSError *error = nil; + + NSXMLDocument *document = nil; + BOOL failed = NO; + NSArray *xmlItems = nil; + NSMutableArray *appcastItems = [NSMutableArray array]; + + if (self.downloadFilename) + { + NSUInteger options = 0; + options = NSXMLNodeLoadExternalEntitiesSameOriginOnly; + document = [[NSXMLDocument alloc] initWithContentsOfURL:[NSURL fileURLWithPath:self.downloadFilename] options:options error:&error]; + + [[NSFileManager defaultManager] removeItemAtPath:self.downloadFilename error:nil]; + self.downloadFilename = nil; + } + else + { + failed = YES; + } + + if (nil == document) + { + failed = YES; + } + else + { + xmlItems = [document nodesForXPath:@"/rss/channel/item" error:&error]; + if (nil == xmlItems) + { + failed = YES; + } + } + + if (failed == NO) + { + + NSEnumerator *nodeEnum = [xmlItems objectEnumerator]; + NSXMLNode *node; + NSMutableDictionary *nodesDict = [NSMutableDictionary dictionary]; + NSMutableDictionary *dict = [NSMutableDictionary dictionary]; + + while (failed == NO && (node = [nodeEnum nextObject])) + { + // First, we'll "index" all the first-level children of this appcast item so we can pick them out by language later. + if ([[node children] count]) + { + node = [node childAtIndex:0]; + while (nil != node) + { + NSString *name = [node name]; + if (name) + { + NSMutableArray *nodes = nodesDict[name]; + if (nodes == nil) + { + nodes = [NSMutableArray array]; + nodesDict[name] = nodes; + } + [nodes addObject:node]; + } + node = [node nextSibling]; + } + } + + for (NSString *name in nodesDict) + { + node = [self bestNodeInNodes:nodesDict[name]]; + if ([name isEqualToString:@"enclosure"]) + { + // enclosure is flattened as a separate dictionary for some reason + NSDictionary *encDict = [(NSXMLElement *)node attributesAsDictionary]; + dict[@"enclosure"] = encDict; + + } + else if ([name isEqualToString:@"pubDate"]) + { + // pubDate is expected to be an NSDate by SUAppcastItem, but the RSS class was returning an NSString + NSDate *date = [NSDate dateWithNaturalLanguageString:[node stringValue]]; + if (date) + dict[name] = date; + } + else if ([name isEqualToString:@"sparkle:deltas"]) + { + NSMutableArray *deltas = [NSMutableArray array]; + NSEnumerator *childEnum = [[node children] objectEnumerator]; + for (NSXMLNode *child in childEnum) { + if ([[child name] isEqualToString:@"enclosure"]) + [deltas addObject:[(NSXMLElement *)child attributesAsDictionary]]; + } + dict[@"deltas"] = deltas; + } + else if (name != nil) + { + // add all other values as strings + NSString *theValue = [[node stringValue] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; + if (theValue != nil) { + dict[name] = theValue; + } + } + } + + NSString *errString; + SUAppcastItem *anItem = [[SUAppcastItem alloc] initWithDictionary:dict failureReason:&errString]; + if (anItem) + { + [appcastItems addObject:anItem]; + } + else + { + SULog(@"Sparkle Updater: Failed to parse appcast item: %@.\nAppcast dictionary was: %@", errString, dict); + } + [nodesDict removeAllObjects]; + [dict removeAllObjects]; + } + } + + if ([appcastItems count]) + { + NSSortDescriptor *sort = [[NSSortDescriptor alloc] initWithKey:@"date" ascending:NO]; + [appcastItems sortUsingDescriptors:@[sort]]; + self.items = appcastItems; + } + + if (failed) + { + [self reportError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUAppcastParseError userInfo:@{ NSLocalizedDescriptionKey: SULocalizedString(@"An error occurred while parsing the update feed.", nil) }]]; + } + else if ([self.delegate respondsToSelector:@selector(appcastDidFinishLoading:)]) + { + [self.delegate appcastDidFinishLoading:self]; + } +} + +- (void)download:(NSURLDownload *)__unused aDownload didFailWithError:(NSError *)error +{ + if (self.downloadFilename) + { + [[NSFileManager defaultManager] removeItemAtPath:self.downloadFilename error:nil]; + } + self.downloadFilename = nil; + + [self reportError:error]; +} + +- (NSURLRequest *)download:(NSURLDownload *)__unused aDownload willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)__unused redirectResponse +{ + return request; +} + +- (void)reportError:(NSError *)error +{ + if ([self.delegate respondsToSelector:@selector(appcast:failedToLoadWithError:)]) + { + [self.delegate appcast:self failedToLoadWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUAppcastError userInfo:@{NSLocalizedDescriptionKey: SULocalizedString(@"An error occurred in retrieving update information. Please try again later.", nil), NSLocalizedFailureReasonErrorKey: [error localizedDescription]}]]; + } +} + +- (NSXMLNode *)bestNodeInNodes:(NSArray *)nodes +{ + // We use this method to pick out the localized version of a node when one's available. + if ([nodes count] == 1) + return nodes[0]; + else if ([nodes count] == 0) + return nil; + + NSMutableArray *languages = [NSMutableArray array]; + NSString *lang; + NSUInteger i; + for (NSXMLElement *node in nodes) { + lang = [[node attributeForName:@"xml:lang"] stringValue]; + [languages addObject:(lang ? lang : @"")]; + } + lang = [NSBundle preferredLocalizationsFromArray:languages][0]; + i = [languages indexOfObject:([languages containsObject:lang] ? lang : @"")]; + if (i == NSNotFound) { + i = 0; + } + return nodes[i]; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUAppcastItem.h b/Frameworks/Sparkle/Sparkle/SUAppcastItem.h new file mode 100644 index 000000000..3334a1af3 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUAppcastItem.h @@ -0,0 +1,40 @@ +// +// SUAppcastItem.h +// Sparkle +// +// Created by Andy Matuschak on 3/12/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUAPPCASTITEM_H +#define SUAPPCASTITEM_H + +@interface SUAppcastItem : NSObject +@property (copy, readonly) NSString *title; +@property (copy, readonly) NSDate *date; +@property (copy, readonly) NSString *itemDescription; +@property (strong, readonly) NSURL *releaseNotesURL; +@property (copy, readonly) NSString *DSASignature; +@property (copy, readonly) NSString *minimumSystemVersion; +@property (copy, readonly) NSString *maximumSystemVersion; +@property (strong, readonly) NSURL *fileURL; +@property (copy, readonly) NSString *versionString; +@property (copy, readonly) NSString *displayVersionString; +@property (copy, readonly) NSDictionary *deltaUpdates; +@property (strong, readonly) NSURL *infoURL; + +// Initializes with data from a dictionary provided by the RSS class. +- (instancetype)initWithDictionary:(NSDictionary *)dict; +- (instancetype)initWithDictionary:(NSDictionary *)dict failureReason:(NSString **)error; + +@property (getter=isDeltaUpdate, readonly) BOOL deltaUpdate; +@property (getter=isCriticalUpdate, readonly) BOOL criticalUpdate; + +// Returns the dictionary provided in initWithDictionary; this might be useful later for extensions. +@property (readonly, copy) NSDictionary *propertiesDictionary; + +- (NSURL *)infoURL; + +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUAppcastItem.m b/Frameworks/Sparkle/Sparkle/SUAppcastItem.m new file mode 100644 index 000000000..fb3dfe44d --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUAppcastItem.m @@ -0,0 +1,180 @@ +// +// SUAppcastItem.m +// Sparkle +// +// Created by Andy Matuschak on 3/12/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#import "SUUpdater.h" + +#import "SUAppcast.h" +#import "SUAppcastItem.h" +#import "SUVersionComparisonProtocol.h" +#import "SUAppcastItem.h" +#import "SULog.h" + +@interface SUAppcastItem () +@property (copy, readwrite) NSString *title; +@property (copy, readwrite) NSDate *date; +@property (copy, readwrite) NSString *itemDescription; +@property (strong, readwrite) NSURL *releaseNotesURL; +@property (copy, readwrite) NSString *DSASignature; +@property (copy, readwrite) NSString *minimumSystemVersion; +@property (copy, readwrite) NSString *maximumSystemVersion; +@property (strong, readwrite) NSURL *fileURL; +@property (copy, readwrite) NSString *versionString; +@property (copy, readwrite) NSString *displayVersionString; +@property (copy, readwrite) NSDictionary *deltaUpdates; +@property (strong, readwrite) NSURL *infoURL; +@property (readwrite, copy) NSDictionary *propertiesDictionary; +@end + +@implementation SUAppcastItem +@synthesize date; +@synthesize deltaUpdates; +@synthesize displayVersionString; +@synthesize DSASignature; +@synthesize fileURL; +@synthesize infoURL; +@synthesize itemDescription; +@synthesize maximumSystemVersion; +@synthesize minimumSystemVersion; +@synthesize releaseNotesURL; +@synthesize title; +@synthesize versionString; +@synthesize propertiesDictionary; + +- (BOOL)isDeltaUpdate +{ + return self.propertiesDictionary[@"enclosure"][@"sparkle:deltaFrom"] != nil; +} + +- (BOOL)isCriticalUpdate +{ + return [self.propertiesDictionary[@"sparkle:tags"] containsObject:@"sparkle:criticalUpdate"]; +} + +- (instancetype)initWithDictionary:(NSDictionary *)dict +{ + return [self initWithDictionary:dict failureReason:nil]; +} + +- (instancetype)initWithDictionary:(NSDictionary *)dict failureReason:(NSString *__autoreleasing *)error +{ + self = [super init]; + if (self) { + id enclosure = dict[@"enclosure"]; + + // Try to find a version string. + // Finding the new version number from the RSS feed is a little bit hacky. There are two ways: + // 1. A "sparkle:version" attribute on the enclosure tag, an extension from the RSS spec. + // 2. If there isn't a version attribute, Sparkle will parse the path in the enclosure, expecting + // that it will look like this: http://something.com/YourApp_0.5.zip. It'll read whatever's between the last + // underscore and the last period as the version number. So name your packages like this: APPNAME_VERSION.extension. + // The big caveat with this is that you can't have underscores in your version strings, as that'll confuse Sparkle. + // Feel free to change the separator string to a hyphen or something more suited to your needs if you like. + NSString *newVersion = enclosure[@"sparkle:version"]; + if (newVersion == nil) { + newVersion = dict[@"sparkle:version"]; // Get version from the item, in case it's a download-less item (i.e. paid upgrade). + } + if (newVersion == nil) // no sparkle:version attribute anywhere? + { + SULog(@"warning: for URL '%@' is missing sparkle:version attribute. Version comparison may be unreliable. Please always specify sparkle:version", enclosure[@"url"]); + + // Separate the url by underscores and take the last component, as that'll be closest to the end, + // then we remove the extension. Hopefully, this will be the version. + NSArray *fileComponents = [enclosure[@"url"] componentsSeparatedByString:@"_"]; + if ([fileComponents count] > 1) { + newVersion = [[fileComponents lastObject] stringByDeletingPathExtension]; + } + } + + if (!newVersion) { + if (error) { + *error = @"Feed item lacks sparkle:version attribute, and version couldn't be deduced from file name (would have used last component of a file name like AppName_1.3.4.zip)"; + } + return nil; + } + + propertiesDictionary = [[NSMutableDictionary alloc] initWithDictionary:dict]; + self.title = dict[@"title"]; + self.date = dict[@"pubDate"]; + self.itemDescription = dict[@"description"]; + + NSString *theInfoURL = dict[@"link"]; + if (theInfoURL) { + if (![theInfoURL isKindOfClass:[NSString class]]) { + SULog(@"SUAppcastItem -initWithDictionary: Info URL is not of valid type."); + } else { + self.infoURL = [NSURL URLWithString:theInfoURL]; + } + } + + // Need an info URL or an enclosure URL. Former to show "More Info" + // page, latter to download & install: + if (!enclosure && !theInfoURL) { + if (error) { + *error = @"No enclosure in feed item"; + } + return nil; + } + + NSString *enclosureURLString = enclosure[@"url"]; + if (!enclosureURLString && !theInfoURL) { + if (error) { + *error = @"Feed item's enclosure lacks URL"; + } + return nil; + } + + if (enclosureURLString) { + NSString *fileURLString = [[enclosureURLString stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + self.fileURL = [NSURL URLWithString:fileURLString]; + } + if (enclosure) { + self.DSASignature = enclosure[@"sparkle:dsaSignature"]; + } + + self.versionString = newVersion; + self.minimumSystemVersion = dict[@"sparkle:minimumSystemVersion"]; + self.maximumSystemVersion = dict[@"sparkle:maximumSystemVersion"]; + + NSString *shortVersionString = enclosure[@"sparkle:shortVersionString"]; + if (nil == shortVersionString) { + shortVersionString = dict[@"sparkle:shortVersionString"]; // fall back on the + } + + if (shortVersionString) { + self.displayVersionString = shortVersionString; + } else { + self.displayVersionString = self.versionString; + } + + // Find the appropriate release notes URL. + if (dict[@"sparkle:releaseNotesLink"]) { + self.releaseNotesURL = [NSURL URLWithString:dict[@"sparkle:releaseNotesLink"]]; + } else if ([self.itemDescription hasPrefix:@"http://"] || [self.itemDescription hasPrefix:@"https://"]) { // if the description starts with http:// or https:// use that. + self.releaseNotesURL = [NSURL URLWithString:self.itemDescription]; + } else { + self.releaseNotesURL = nil; + } + + if (dict[@"deltas"]) { + NSMutableDictionary *deltas = [NSMutableDictionary dictionary]; + NSArray *deltaDictionaries = dict[@"deltas"]; + for (NSDictionary *deltaDictionary in deltaDictionaries) { + NSMutableDictionary *fakeAppCastDict = [dict mutableCopy]; + [fakeAppCastDict removeObjectForKey:@"deltas"]; + fakeAppCastDict[@"enclosure"] = deltaDictionary; + SUAppcastItem *deltaItem = [[[self class] alloc] initWithDictionary:fakeAppCastDict]; + + deltas[deltaDictionary[@"sparkle:deltaFrom"]] = deltaItem; + } + self.deltaUpdates = deltas; + } + } + return self; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUAutomaticUpdateAlert.h b/Frameworks/Sparkle/Sparkle/SUAutomaticUpdateAlert.h new file mode 100644 index 000000000..0a2c86102 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUAutomaticUpdateAlert.h @@ -0,0 +1,36 @@ +// +// SUAutomaticUpdateAlert.h +// Sparkle +// +// Created by Andy Matuschak on 3/18/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUAUTOMATICUPDATEALERT_H +#define SUAUTOMATICUPDATEALERT_H + +#import "SUWindowController.h" + +@protocol SUAutomaticUpdateAlertDelegate; + +typedef NS_ENUM(NSInteger, SUAutomaticInstallationChoice) { + SUInstallNowChoice, + SUInstallLaterChoice, + SUDoNotInstallChoice +}; + +@class SUAppcastItem, SUHost; +@interface SUAutomaticUpdateAlert : SUWindowController + +- (instancetype)initWithAppcastItem:(SUAppcastItem *)item host:(SUHost *)hostBundle delegate:(id)delegate; +- (IBAction)installNow:sender; +- (IBAction)installLater:sender; +- (IBAction)doNotInstall:sender; + +@end + +@protocol SUAutomaticUpdateAlertDelegate +- (void)automaticUpdateAlert:(SUAutomaticUpdateAlert *)aua finishedWithChoice:(SUAutomaticInstallationChoice)choice; +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUAutomaticUpdateAlert.m b/Frameworks/Sparkle/Sparkle/SUAutomaticUpdateAlert.m new file mode 100644 index 000000000..85cb0cbcb --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUAutomaticUpdateAlert.m @@ -0,0 +1,87 @@ +// +// SUAutomaticUpdateAlert.m +// Sparkle +// +// Created by Andy Matuschak on 3/18/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#import "SUAutomaticUpdateAlert.h" + +#import "SUHost.h" + +@interface SUAutomaticUpdateAlert () +@property (strong) SUAppcastItem *updateItem; +@property (weak) id delegate; +@property (strong) SUHost *host; +@end + +@implementation SUAutomaticUpdateAlert +@synthesize delegate; +@synthesize host; +@synthesize updateItem; + +- (instancetype)initWithAppcastItem:(SUAppcastItem *)item host:(SUHost *)aHost delegate:(id)del +{ + self = [super initWithHost:aHost windowNibName:@"SUAutomaticUpdateAlert"]; + if (self) + { + self.updateItem = item; + self.delegate = del; + self.host = aHost; + [self setShouldCascadeWindows:NO]; + [[self window] center]; + } + return self; +} + +- (NSString *)description { return [NSString stringWithFormat:@"%@ <%@, %@>", [self class], [self.host bundlePath], [self.host installationPath]]; } + +- (IBAction)installNow:(id)__unused sender +{ + [self close]; + [self.delegate automaticUpdateAlert:self finishedWithChoice:SUInstallNowChoice]; +} + +- (IBAction)installLater:(id)__unused sender +{ + [self close]; + [self.delegate automaticUpdateAlert:self finishedWithChoice:SUInstallLaterChoice]; +} + +- (IBAction)doNotInstall:(id)__unused sender +{ + [self close]; + [self.delegate automaticUpdateAlert:self finishedWithChoice:SUDoNotInstallChoice]; +} + +- (NSImage *)applicationIcon +{ + return [self.host icon]; +} + +- (NSString *)titleText +{ + if ([self.updateItem isCriticalUpdate]) + { + return [NSString stringWithFormat:SULocalizedString(@"An important update to %@ is ready to install", nil), [self.host name]]; + } + else + { + return [NSString stringWithFormat:SULocalizedString(@"A new version of %@ is ready to install!", nil), [self.host name]]; + } +} + +- (NSString *)descriptionText +{ + if ([self.updateItem isCriticalUpdate]) + { + return [NSString stringWithFormat:SULocalizedString(@"%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?", nil), [self.host name], [self.updateItem displayVersionString]]; + } + else + { + return [NSString stringWithFormat:SULocalizedString(@"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?", nil), [self.host name], [self.updateItem displayVersionString]]; + } +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUAutomaticUpdateDriver.h b/Frameworks/Sparkle/Sparkle/SUAutomaticUpdateDriver.h new file mode 100644 index 000000000..9935936eb --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUAutomaticUpdateDriver.h @@ -0,0 +1,20 @@ +// +// SUAutomaticUpdateDriver.h +// Sparkle +// +// Created by Andy Matuschak on 5/6/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUAUTOMATICUPDATEDRIVER_H +#define SUAUTOMATICUPDATEDRIVER_H + +#import +#import "SUBasicUpdateDriver.h" +#import "SUAutomaticUpdateAlert.h" + +@interface SUAutomaticUpdateDriver : SUBasicUpdateDriver + +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUAutomaticUpdateDriver.m b/Frameworks/Sparkle/Sparkle/SUAutomaticUpdateDriver.m new file mode 100644 index 000000000..ff6668a0d --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUAutomaticUpdateDriver.m @@ -0,0 +1,189 @@ +// +// SUAutomaticUpdateDriver.m +// Sparkle +// +// Created by Andy Matuschak on 5/6/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUAutomaticUpdateDriver.h" + +#import "SUAutomaticUpdateAlert.h" +#import "SUHost.h" +#import "SUConstants.h" + +// If the user hasn't quit in a week, ask them if they want to relaunch to get the latest bits. It doesn't matter that this measure of "one day" is imprecise. +static const NSTimeInterval SUAutomaticUpdatePromptImpatienceTimer = 60 * 60 * 24 * 7; + +@interface SUUpdateDriver () + +@property (getter=isInterruptible) BOOL interruptible; + +@end + +@interface SUAutomaticUpdateDriver () + +@property (assign) BOOL postponingInstallation; +@property (assign) BOOL showErrors; +@property (assign) BOOL willUpdateOnTermination; +@property (strong) SUAutomaticUpdateAlert *alert; +@property (strong) NSTimer *showUpdateAlertTimer; + +@end + +@implementation SUAutomaticUpdateDriver + +@synthesize postponingInstallation; +@synthesize showErrors; +@synthesize willUpdateOnTermination; +@synthesize alert; +@synthesize showUpdateAlertTimer; + +- (void)showUpdateAlert +{ + self.interruptible = NO; + self.alert = [[SUAutomaticUpdateAlert alloc] initWithAppcastItem:self.updateItem host:self.host delegate:self]; + + // If the app is a menubar app or the like, we need to focus it first and alter the + // update prompt to behave like a normal window. Otherwise if the window were hidden + // there may be no way for the application to be activated to make it visible again. + if ([self.host isBackgroundApplication]) + { + [[self.alert window] setHidesOnDeactivate:NO]; + [NSApp activateIgnoringOtherApps:YES]; + } + + if ([NSApp isActive]) + [[self.alert window] makeKeyAndOrderFront:self]; + else + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive:) name:NSApplicationDidBecomeActiveNotification object:NSApp]; +} + +- (void)unarchiverDidFinish:(SUUnarchiver *)__unused ua +{ + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationWillTerminate:) name:NSApplicationWillTerminateNotification object:nil]; + + // Sudden termination is available on 10.6+ + NSProcessInfo *processInfo = [NSProcessInfo processInfo]; + [processInfo disableSuddenTermination]; + + self.willUpdateOnTermination = YES; + + id updaterDelegate = [self.updater delegate]; + if ([updaterDelegate respondsToSelector:@selector(updater:willInstallUpdateOnQuit:immediateInstallationInvocation:)]) + { + BOOL relaunch = YES; + BOOL showUI = NO; + NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[[self class] instanceMethodSignatureForSelector:@selector(installWithToolAndRelaunch:displayingUserInterface:)]]; + [invocation setSelector:@selector(installWithToolAndRelaunch:displayingUserInterface:)]; + [invocation setArgument:&relaunch atIndex:2]; + [invocation setArgument:&showUI atIndex:3]; + [invocation setTarget:self]; + + [updaterDelegate updater:self.updater willInstallUpdateOnQuit:self.updateItem immediateInstallationInvocation:invocation]; + } + + // If this is marked as a critical update, we'll prompt the user to install it right away. + if ([self.updateItem isCriticalUpdate]) + { + [self showUpdateAlert]; + } + else + { + self.showUpdateAlertTimer = [NSTimer scheduledTimerWithTimeInterval:SUAutomaticUpdatePromptImpatienceTimer target:self selector:@selector(showUpdateAlert) userInfo:nil repeats:NO]; + + // At this point the driver is idle, allow it to be interrupted for user-initiated update checks. + self.interruptible = YES; + } +} + +- (void)stopUpdatingOnTermination +{ + if (self.willUpdateOnTermination) + { + [[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationWillTerminateNotification object:nil]; + NSProcessInfo *processInfo = [NSProcessInfo processInfo]; + [processInfo enableSuddenTermination]; + + self.willUpdateOnTermination = NO; + + id updaterDelegate = [self.updater delegate]; + if ([updaterDelegate respondsToSelector:@selector(updater:didCancelInstallUpdateOnQuit:)]) + [updaterDelegate updater:self.updater didCancelInstallUpdateOnQuit:self.updateItem]; + } +} + +- (void)invalidateShowUpdateAlertTimer +{ + [self.showUpdateAlertTimer invalidate]; + self.showUpdateAlertTimer = nil; +} + +- (void)dealloc +{ + [self stopUpdatingOnTermination]; + [self invalidateShowUpdateAlertTimer]; +} + +- (void)abortUpdate +{ + [self stopUpdatingOnTermination]; + [self invalidateShowUpdateAlertTimer]; + [super abortUpdate]; +} + +- (void)applicationDidBecomeActive:(NSNotification *)__unused aNotification +{ + [[self.alert window] makeKeyAndOrderFront:self]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:@"NSApplicationDidBecomeActiveNotification" object:NSApp]; +} + +- (void)automaticUpdateAlert:(SUAutomaticUpdateAlert *)__unused aua finishedWithChoice:(SUAutomaticInstallationChoice)choice +{ + switch (choice) + { + case SUInstallNowChoice: + [self stopUpdatingOnTermination]; + [self installWithToolAndRelaunch:YES]; + break; + + case SUInstallLaterChoice: + self.postponingInstallation = YES; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationWillTerminate:) name:NSApplicationWillTerminateNotification object:nil]; + // We're already waiting on quit, just indicate that we're idle. + self.interruptible = YES; + break; + + case SUDoNotInstallChoice: + [self.host setObject:[self.updateItem versionString] forUserDefaultsKey:SUSkippedVersionKey]; + [self abortUpdate]; + break; + } +} + +- (BOOL)shouldInstallSynchronously { return self.postponingInstallation; } + +- (void)installWithToolAndRelaunch:(BOOL)relaunch displayingUserInterface:(BOOL)showUI +{ + if (relaunch) { + [self stopUpdatingOnTermination]; + } + + self.showErrors = YES; + [super installWithToolAndRelaunch:relaunch displayingUserInterface:showUI]; +} + +- (void)applicationWillTerminate:(NSNotification *)__unused note +{ + [self installWithToolAndRelaunch:NO]; +} + +- (void)abortUpdateWithError:(NSError *)error +{ + if (self.showErrors) + [super abortUpdateWithError:error]; + else + [self abortUpdate]; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUBasicUpdateDriver.h b/Frameworks/Sparkle/Sparkle/SUBasicUpdateDriver.h new file mode 100644 index 000000000..32e320bc6 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUBasicUpdateDriver.h @@ -0,0 +1,55 @@ +// +// SUBasicUpdateDriver.h +// Sparkle, +// +// Created by Andy Matuschak on 4/23/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUBASICUPDATEDRIVER_H +#define SUBASICUPDATEDRIVER_H + +#import +#import "SUUpdateDriver.h" +#import "SUUnarchiver.h" +#import "SUAppcast.h" + +@class SUAppcastItem, SUHost; +@interface SUBasicUpdateDriver : SUUpdateDriver + +@property (strong, readonly) SUAppcastItem *updateItem; +@property (strong, readonly) NSURLDownload *download; +@property (copy, readonly) NSString *downloadPath; + +- (void)checkForUpdatesAtURL:(NSURL *)URL host:(SUHost *)host; + +- (BOOL)isItemNewer:(SUAppcastItem *)ui; +- (BOOL)hostSupportsItem:(SUAppcastItem *)ui; +- (BOOL)itemContainsSkippedVersion:(SUAppcastItem *)ui; +- (BOOL)itemContainsValidUpdate:(SUAppcastItem *)ui; +- (void)didFindValidUpdate; +- (void)didNotFindUpdate; + +- (void)downloadUpdate; +- (void)download:(NSURLDownload *)d decideDestinationWithSuggestedFilename:(NSString *)name; +- (void)downloadDidFinish:(NSURLDownload *)d; +- (void)download:(NSURLDownload *)download didFailWithError:(NSError *)error; + +- (void)extractUpdate; +- (void)unarchiverDidFinish:(SUUnarchiver *)ua; +- (void)unarchiverDidFail:(SUUnarchiver *)ua; +- (void)failedToApplyDeltaUpdate; + +- (void)installWithToolAndRelaunch:(BOOL)relaunch; +- (void)installWithToolAndRelaunch:(BOOL)relaunch displayingUserInterface:(BOOL)showUI; +- (void)installerForHost:(SUHost *)host failedWithError:(NSError *)error; + +- (void)cleanUpDownload; + +- (void)abortUpdate; +- (void)abortUpdateWithError:(NSError *)error; +- (void)terminateApp; + +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUBasicUpdateDriver.m b/Frameworks/Sparkle/Sparkle/SUBasicUpdateDriver.m new file mode 100644 index 000000000..06727ee75 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUBasicUpdateDriver.m @@ -0,0 +1,451 @@ +// +// SUBasicUpdateDriver.m +// Sparkle +// +// Created by Andy Matuschak on 4/23/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUBasicUpdateDriver.h" + +#import "SUHost.h" +#import "SUDSAVerifier.h" +#import "SUInstaller.h" +#import "SUStandardVersionComparator.h" +#import "SUUnarchiver.h" +#import "SUConstants.h" +#import "SULog.h" +#import "SUPlainInstaller.h" +#import "SUPlainInstallerInternals.h" +#import "SUBinaryDeltaCommon.h" +#import "SUCodeSigningVerifier.h" +#import "SUUpdater_Private.h" + +#ifdef FINISH_INSTALL_TOOL_NAME +// FINISH_INSTALL_TOOL_NAME expands to unquoted Autoupdate +#define QUOTE_NS_STRING2(str) @"" #str +#define QUOTE_NS_STRING1(str) QUOTE_NS_STRING2(str) +#define FINISH_INSTALL_TOOL_NAME_STRING QUOTE_NS_STRING1(FINISH_INSTALL_TOOL_NAME) +#else +#error FINISH_INSTALL_TOOL_NAME not defined +#endif + +@interface SUBasicUpdateDriver () + +@property (strong) SUAppcastItem *updateItem; +@property (strong) NSURLDownload *download; +@property (copy) NSString *downloadPath; + +@property (strong) SUAppcastItem *nonDeltaUpdateItem; +@property (copy) NSString *tempDir; +@property (copy) NSString *relaunchPath; + +@end + +@implementation SUBasicUpdateDriver + +@synthesize updateItem; +@synthesize download; +@synthesize downloadPath; + +@synthesize nonDeltaUpdateItem; +@synthesize tempDir; +@synthesize relaunchPath; + +- (void)checkForUpdatesAtURL:(NSURL *)URL host:(SUHost *)aHost +{ + [super checkForUpdatesAtURL:URL host:aHost]; + if ([aHost isRunningOnReadOnlyVolume]) + { + [self abortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SURunningFromDiskImageError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:SULocalizedString(@"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again.", nil), [aHost name]] }]]; + return; + } + + SUAppcast *appcast = [[SUAppcast alloc] init]; + + [appcast setDelegate:self]; + [appcast setUserAgentString:[self.updater userAgentString]]; + [appcast fetchAppcastFromURL:URL]; +} + +- (id)versionComparator +{ + id comparator = nil; + + // Give the delegate a chance to provide a custom version comparator + if ([[self.updater delegate] respondsToSelector:@selector(versionComparatorForUpdater:)]) { + comparator = [[self.updater delegate] versionComparatorForUpdater:self.updater]; + } + + // If we don't get a comparator from the delegate, use the default comparator + if (!comparator) { + comparator = [SUStandardVersionComparator defaultComparator]; + } + + return comparator; +} + +- (BOOL)isItemNewer:(SUAppcastItem *)ui +{ + return [[self versionComparator] compareVersion:[self.host version] toVersion:[ui versionString]] == NSOrderedAscending; +} + +- (BOOL)hostSupportsItem:(SUAppcastItem *)ui +{ + if (([ui minimumSystemVersion] == nil || [[ui minimumSystemVersion] isEqualToString:@""]) && + ([ui maximumSystemVersion] == nil || [[ui maximumSystemVersion] isEqualToString:@""])) { return YES; } + + BOOL minimumVersionOK = TRUE; + BOOL maximumVersionOK = TRUE; + + // Check minimum and maximum System Version + if ([ui minimumSystemVersion] != nil && ![[ui minimumSystemVersion] isEqualToString:@""]) { + minimumVersionOK = [[SUStandardVersionComparator defaultComparator] compareVersion:[ui minimumSystemVersion] toVersion:[SUHost systemVersionString]] != NSOrderedDescending; + } + if ([ui maximumSystemVersion] != nil && ![[ui maximumSystemVersion] isEqualToString:@""]) { + maximumVersionOK = [[SUStandardVersionComparator defaultComparator] compareVersion:[ui maximumSystemVersion] toVersion:[SUHost systemVersionString]] != NSOrderedAscending; + } + + return minimumVersionOK && maximumVersionOK; +} + +- (BOOL)itemContainsSkippedVersion:(SUAppcastItem *)ui +{ + NSString *skippedVersion = [self.host objectForUserDefaultsKey:SUSkippedVersionKey]; + if (skippedVersion == nil) { return NO; } + return [[self versionComparator] compareVersion:[ui versionString] toVersion:skippedVersion] != NSOrderedDescending; +} + +- (BOOL)itemContainsValidUpdate:(SUAppcastItem *)ui +{ + return ui && [self hostSupportsItem:ui] && [self isItemNewer:ui] && ![self itemContainsSkippedVersion:ui]; +} + +- (void)appcastDidFinishLoading:(SUAppcast *)ac +{ + if ([[self.updater delegate] respondsToSelector:@selector(updater:didFinishLoadingAppcast:)]) { + [[self.updater delegate] updater:self.updater didFinishLoadingAppcast:ac]; + } + + NSDictionary *userInfo = (ac != nil) ? @{ SUUpdaterAppcastNotificationKey: ac } : nil; + [[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterDidFinishLoadingAppCastNotification object:self.updater userInfo:userInfo]; + + SUAppcastItem *item = nil; + + // Now we have to find the best valid update in the appcast. + if ([[self.updater delegate] respondsToSelector:@selector(bestValidUpdateInAppcast:forUpdater:)]) // Does the delegate want to handle it? + { + item = [[self.updater delegate] bestValidUpdateInAppcast:ac forUpdater:self.updater]; + } + else // If not, we'll take care of it ourselves. + { + // Find the first update we can actually use. + NSEnumerator *updateEnumerator = [[ac items] objectEnumerator]; + do { + item = [updateEnumerator nextObject]; + } while (item && ![self hostSupportsItem:item]); + + if (binaryDeltaSupported()) { + SUAppcastItem *deltaUpdateItem = [item deltaUpdates][[self.host version]]; + if (deltaUpdateItem && [self hostSupportsItem:deltaUpdateItem]) { + self.nonDeltaUpdateItem = item; + item = deltaUpdateItem; + } + } + } + + if ([self itemContainsValidUpdate:item]) { + self.updateItem = item; + [self didFindValidUpdate]; + } else { + self.updateItem = nil; + [self didNotFindUpdate]; + } +} + +- (void)appcast:(SUAppcast *)__unused ac failedToLoadWithError:(NSError *)error +{ + [self abortUpdateWithError:error]; +} + +- (void)didFindValidUpdate +{ + assert(self.updateItem); + + if ([[self.updater delegate] respondsToSelector:@selector(updater:didFindValidUpdate:)]) { + [[self.updater delegate] updater:self.updater didFindValidUpdate:self.updateItem]; + } + + [[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterDidFindValidUpdateNotification + object:self.updater + userInfo:@{ SUUpdaterAppcastItemNotificationKey: self.updateItem }]; + [self downloadUpdate]; +} + +- (void)didNotFindUpdate +{ + if ([[self.updater delegate] respondsToSelector:@selector(updaterDidNotFindUpdate:)]) { + [[self.updater delegate] updaterDidNotFindUpdate:self.updater]; + } + + [[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterDidNotFindUpdateNotification object:self.updater]; + + [self abortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain + code:SUNoUpdateError + userInfo:@{ + NSLocalizedDescriptionKey: [NSString stringWithFormat:SULocalizedString(@"You already have the newest version of %@.", "'Error' message when the user checks for updates but is already current or the feed doesn't contain any updates. (not necessarily shown in UI)"), self.host.name] + }]]; +} + +- (void)downloadUpdate +{ + NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[self.updateItem fileURL]]; + [request setValue:[self.updater userAgentString] forHTTPHeaderField:@"User-Agent"]; + self.download = [[NSURLDownload alloc] initWithRequest:request delegate:self]; +} + +- (void)download:(NSURLDownload *)__unused d decideDestinationWithSuggestedFilename:(NSString *)name +{ + NSString *downloadFileName = [NSString stringWithFormat:@"%@ %@", [self.host name], [self.updateItem versionString]]; + + + self.tempDir = [[self.host appSupportPath] stringByAppendingPathComponent:downloadFileName]; + int cnt = 1; + while ([[NSFileManager defaultManager] fileExistsAtPath:self.tempDir] && cnt <= 999) + { + self.tempDir = [[self.host appSupportPath] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@ %d", downloadFileName, cnt++]]; + } + + // Create the temporary directory if necessary. + BOOL success = [[NSFileManager defaultManager] createDirectoryAtPath:self.tempDir withIntermediateDirectories:YES attributes:nil error:NULL]; + if (!success) + { + // Okay, something's really broken with this user's file structure. + [self.download cancel]; + [self abortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUTemporaryDirectoryError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Can't make a temporary directory for the update download at %@.", self.tempDir] }]]; + } + + self.downloadPath = [self.tempDir stringByAppendingPathComponent:name]; + [self.download setDestination:self.downloadPath allowOverwrite:YES]; +} + +- (BOOL)validateUpdateDownloadedToPath:(NSString *)downloadedPath extractedToPath:(NSString *)extractedPath DSASignature:(NSString *)DSASignature publicDSAKey:(NSString *)publicDSAKey +{ + NSString *newBundlePath = [SUInstaller appPathInUpdateFolder:extractedPath forHost:self.host]; + + if (newBundlePath) { + if ([SUCodeSigningVerifier hostApplicationIsCodeSigned]) { + NSError *error = nil; + if ([SUCodeSigningVerifier codeSignatureIsValidAtPath:newBundlePath error:&error]) { + return YES; + } else { + SULog(@"Code signature check on update failed: %@. Sparkle will use DSA signature instead.", error); + } + } else { + SULog(@"The host app is not signed using Apple Code Signing, and therefore cannot verify updates this way. Sparkle will use DSA signature instead."); + } + } + + if (DSASignature) { + return [SUDSAVerifier validatePath:downloadedPath withEncodedDSASignature:DSASignature withPublicDSAKey:publicDSAKey]; + } else { + SULog(@"The appcast item for the update has no DSA signature. The update will be rejected, because both DSA and Apple Code Signing verification failed."); + return NO; + } +} + +- (void)downloadDidFinish:(NSURLDownload *)__unused d +{ + assert(self.updateItem); + + [self extractUpdate]; +} + +- (void)download:(NSURLDownload *)__unused download didFailWithError:(NSError *)error +{ + [self abortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SURelaunchError userInfo:@{NSLocalizedDescriptionKey: SULocalizedString(@"An error occurred while downloading the update. Please try again later.", nil), NSLocalizedFailureReasonErrorKey: [error localizedDescription]}]]; +} + +- (BOOL)download:(NSURLDownload *)__unused download shouldDecodeSourceDataOfMIMEType:(NSString *)encodingType +{ + // We don't want the download system to extract our gzips. + // Note that we use a substring matching here instead of direct comparison because the docs say "application/gzip" but the system *uses* "application/x-gzip". This is a documentation bug. + return ([encodingType rangeOfString:@"gzip"].location == NSNotFound); +} + +- (void)extractUpdate +{ + SUUnarchiver *unarchiver = [SUUnarchiver unarchiverForPath:self.downloadPath updatingHost:self.host]; + if (!unarchiver) + { + SULog(@"Error: No valid unarchiver for %@!", self.downloadPath); + [self unarchiverDidFail:nil]; + return; + } + [unarchiver setDelegate:self]; + [unarchiver start]; +} + +- (void)failedToApplyDeltaUpdate +{ + // When a delta update fails to apply we fall back on updating via a full install. + self.updateItem = self.nonDeltaUpdateItem; + self.nonDeltaUpdateItem = nil; + + [self downloadUpdate]; +} + +- (void)unarchiverDidFinish:(SUUnarchiver *)__unused ua +{ + assert(self.updateItem); + + [self installWithToolAndRelaunch:YES]; +} + +- (void)unarchiverDidFail:(SUUnarchiver *)__unused ua +{ + if ([self.updateItem isDeltaUpdate]) { + [self failedToApplyDeltaUpdate]; + return; + } + + [self abortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey: SULocalizedString(@"An error occurred while extracting the archive. Please try again later.", nil) }]]; +} + +- (BOOL)shouldInstallSynchronously { return NO; } + +- (void)installWithToolAndRelaunch:(BOOL)relaunch +{ + // Perhaps a poor assumption but: if we're not relaunching, we assume we shouldn't be showing any UI either. Because non-relaunching installations are kicked off without any user interaction, we shouldn't be interrupting them. + [self installWithToolAndRelaunch:relaunch displayingUserInterface:relaunch]; +} + +- (void)installWithToolAndRelaunch:(BOOL)relaunch displayingUserInterface:(BOOL)showUI +{ + assert(self.updateItem); + + if (![self validateUpdateDownloadedToPath:self.downloadPath extractedToPath:self.tempDir DSASignature:self.updateItem.DSASignature publicDSAKey:self.host.publicDSAKey]) + { + NSDictionary *userInfo = @{ + NSLocalizedDescriptionKey: SULocalizedString(@"An error occurred while extracting the archive. Please try again later.", nil), + NSLocalizedFailureReasonErrorKey: SULocalizedString(@"The update is improperly signed.", nil), + }; + [self abortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUSignatureError userInfo:userInfo]]; + return; + } + + if (![self.updater mayUpdateAndRestart]) + { + [self abortUpdate]; + return; + } + + // Give the host app an opportunity to postpone the install and relaunch. + static BOOL postponedOnce = NO; + id updaterDelegate = [self.updater delegate]; + if (!postponedOnce && [updaterDelegate respondsToSelector:@selector(updater:shouldPostponeRelaunchForUpdate:untilInvoking:)]) + { + NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[[self class] instanceMethodSignatureForSelector:@selector(installWithToolAndRelaunch:)]]; + [invocation setSelector:@selector(installWithToolAndRelaunch:)]; + [invocation setArgument:&relaunch atIndex:2]; + [invocation setTarget:self]; + postponedOnce = YES; + if ([updaterDelegate updater:self.updater shouldPostponeRelaunchForUpdate:self.updateItem untilInvoking:invocation]) { + return; + } + } + + + if ([updaterDelegate respondsToSelector:@selector(updater:willInstallUpdate:)]) { + [updaterDelegate updater:self.updater willInstallUpdate:self.updateItem]; + } + + NSString *const finishInstallToolName = FINISH_INSTALL_TOOL_NAME_STRING; + + // Copy the relauncher into a temporary directory so we can get to it after the new version's installed. + // Only the paranoid survive: if there's already a stray copy of relaunch there, we would have problems. + NSString *relaunchPathToCopy = [SPARKLE_BUNDLE pathForResource:finishInstallToolName ofType:@"app"]; + if (relaunchPathToCopy != nil) + { + NSString *targetPath = [[self.host appSupportPath] stringByAppendingPathComponent:[relaunchPathToCopy lastPathComponent]]; + // Only the paranoid survive: if there's already a stray copy of relaunch there, we would have problems. + NSError *error = nil; + [[NSFileManager defaultManager] createDirectoryAtPath:[targetPath stringByDeletingLastPathComponent] withIntermediateDirectories:YES attributes:@{} error:&error]; + + if ([SUPlainInstaller copyPathWithAuthentication:relaunchPathToCopy overPath:targetPath temporaryName:nil error:&error]) + self.relaunchPath = targetPath; + else + [self abortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SURelaunchError userInfo:@{NSLocalizedDescriptionKey: SULocalizedString(@"An error occurred while extracting the archive. Please try again later.", nil), NSLocalizedFailureReasonErrorKey: [NSString stringWithFormat:@"Couldn't copy relauncher (%@) to temporary path (%@)! %@", relaunchPathToCopy, targetPath, (error ? [error localizedDescription] : @"")]}]]; + } + + [[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterWillRestartNotification object:self]; + if ([updaterDelegate respondsToSelector:@selector(updaterWillRelaunchApplication:)]) + [updaterDelegate updaterWillRelaunchApplication:self.updater]; + + if(!self.relaunchPath || ![[NSFileManager defaultManager] fileExistsAtPath:self.relaunchPath]) + { + // Note that we explicitly use the host app's name here, since updating plugin for Mail relaunches Mail, not just the plugin. + [self abortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SURelaunchError userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:SULocalizedString(@"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@.", nil), [self.host name]], NSLocalizedFailureReasonErrorKey: [NSString stringWithFormat:@"Couldn't find the relauncher (expected to find it at %@)", self.relaunchPath]}]]; + // We intentionally don't abandon the update here so that the host won't initiate another. + return; + } + + NSString *pathToRelaunch = [self.host bundlePath]; + if ([updaterDelegate respondsToSelector:@selector(pathToRelaunchForUpdater:)]) { + pathToRelaunch = [updaterDelegate pathToRelaunchForUpdater:self.updater]; + } + NSString *relaunchToolPath = [[self.relaunchPath stringByAppendingPathComponent:@"/Contents/MacOS"] stringByAppendingPathComponent:finishInstallToolName]; + [NSTask launchedTaskWithLaunchPath:relaunchToolPath arguments:@[[self.host bundlePath], + pathToRelaunch, + [NSString stringWithFormat:@"%d", [[NSProcessInfo processInfo] processIdentifier]], + self.tempDir, + relaunch ? @"1" : @"0", + showUI ? @"1" : @"0"]]; + [self terminateApp]; +} + +- (void)terminateApp +{ + [NSApp terminate:self]; +} + +- (void)cleanUpDownload +{ + if (self.tempDir != nil) // tempDir contains downloadPath, so we implicitly delete both here. + { + BOOL success = NO; + NSError *error = nil; + success = [[NSFileManager defaultManager] removeItemAtPath:self.tempDir error:&error]; // Clean up the copied relauncher + if (!success) + [[NSWorkspace sharedWorkspace] performFileOperation:NSWorkspaceRecycleOperation source:[self.tempDir stringByDeletingLastPathComponent] destination:@"" files:@[[self.tempDir lastPathComponent]] tag:NULL]; + } +} + +- (void)installerForHost:(SUHost *)aHost failedWithError:(NSError *)error +{ + if (aHost != self.host) { return; } + NSError *dontThrow = nil; + [[NSFileManager defaultManager] removeItemAtPath:self.relaunchPath error:&dontThrow]; // Clean up the copied relauncher + [self abortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{NSLocalizedDescriptionKey: SULocalizedString(@"An error occurred while installing the update. Please try again later.", nil), NSLocalizedFailureReasonErrorKey: [error localizedDescription]}]]; +} + +- (void)abortUpdate +{ + [self cleanUpDownload]; + [[NSNotificationCenter defaultCenter] removeObserver:self]; + self.updateItem = nil; + [super abortUpdate]; +} + +- (void)abortUpdateWithError:(NSError *)error +{ + if ([error code] != SUNoUpdateError) { // Let's not bother logging this. + SULog(@"Error: %@ %@", [error localizedDescription], [error localizedFailureReason]); + } + if (self.download) { + [self.download cancel]; + } + [self abortUpdate]; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUBinaryDeltaApply.h b/Frameworks/Sparkle/Sparkle/SUBinaryDeltaApply.h new file mode 100644 index 000000000..d44501093 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUBinaryDeltaApply.h @@ -0,0 +1,15 @@ +// +// SUBinaryDeltaApply.h +// Sparkle +// +// Created by Mark Rowe on 2009-06-01. +// Copyright 2009 Mark Rowe. All rights reserved. +// + +#ifndef SUBINARYDELTAAPPLY_H +#define SUBINARYDELTAAPPLY_H + +@class NSString; +int applyBinaryDelta(NSString *source, NSString *destination, NSString *patchFile); + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUBinaryDeltaApply.m b/Frameworks/Sparkle/Sparkle/SUBinaryDeltaApply.m new file mode 100644 index 000000000..f19f76f3a --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUBinaryDeltaApply.m @@ -0,0 +1,101 @@ +// +// SUBinaryDeltaApply.m +// Sparkle +// +// Created by Mark Rowe on 2009-06-01. +// Copyright 2009 Mark Rowe. All rights reserved. +// + +#import "SUBinaryDeltaApply.h" +#import "SUBinaryDeltaCommon.h" +#include +#import +#include +#include +#include +#include + +static void applyBinaryDeltaToFile(xar_t x, xar_file_t file, NSString *sourceFilePath, NSString *destinationFilePath) +{ + NSString *patchFile = temporaryFilename(@"apply-binary-delta"); + xar_extract_tofile(x, file, [patchFile fileSystemRepresentation]); + const char *argv[] = {"/usr/bin/bspatch", [sourceFilePath fileSystemRepresentation], [destinationFilePath fileSystemRepresentation], [patchFile fileSystemRepresentation]}; + bspatch(4, (char **)argv); + unlink([patchFile fileSystemRepresentation]); +} + +int applyBinaryDelta(NSString *source, NSString *destination, NSString *patchFile) +{ + xar_t x = xar_open([patchFile UTF8String], READ); + if (!x) { + fprintf(stderr, "Unable to open %s. Giving up.\n", [patchFile UTF8String]); + return 1; + } + + NSString *expectedBeforeHash = nil; + NSString *expectedAfterHash = nil; + xar_subdoc_t subdoc; + for (subdoc = xar_subdoc_first(x); subdoc; subdoc = xar_subdoc_next(subdoc)) { + if (!strcmp(xar_subdoc_name(subdoc), "binary-delta-attributes")) { + const char *value = 0; + xar_subdoc_prop_get(subdoc, "before-sha1", &value); + if (value) + expectedBeforeHash = @(value); + + xar_subdoc_prop_get(subdoc, "after-sha1", &value); + if (value) + expectedAfterHash = @(value); + } + } + + if (!expectedBeforeHash || !expectedAfterHash) { + fprintf(stderr, "Unable to find before-sha1 or after-sha1 metadata in delta. Giving up.\n"); + return 1; + } + + fprintf(stderr, "Verifying source... "); + NSString *beforeHash = hashOfTree(source); + + if (![beforeHash isEqualToString:expectedBeforeHash]) { + fprintf(stderr, "Source doesn't have expected hash (%s != %s). Giving up.\n", [expectedBeforeHash UTF8String], [beforeHash UTF8String]); + return 1; + } + + fprintf(stderr, "\nCopying files... "); + removeTree(destination); + copyTree(source, destination); + + fprintf(stderr, "\nPatching... "); + xar_file_t file; + xar_iter_t iter = xar_iter_new(); + for (file = xar_file_first(x, iter); file; file = xar_file_next(iter)) { + NSString *path = @(xar_get_path(file)); + NSString *sourceFilePath = [source stringByAppendingPathComponent:path]; + NSString *destinationFilePath = [destination stringByAppendingPathComponent:path]; + + const char *value; + if (!xar_prop_get(file, "delete", &value) || !xar_prop_get(file, "delete-then-extract", &value)) { + removeTree(destinationFilePath); + if (!xar_prop_get(file, "delete", &value)) + continue; + } + + if (!xar_prop_get(file, "binary-delta", &value)) + applyBinaryDeltaToFile(x, file, sourceFilePath, destinationFilePath); + else + xar_extract_tofile(x, file, [destinationFilePath fileSystemRepresentation]); + } + xar_close(x); + + fprintf(stderr, "\nVerifying destination... "); + NSString *afterHash = hashOfTree(destination); + + if (![afterHash isEqualToString:expectedAfterHash]) { + fprintf(stderr, "Destination doesn't have expected hash (%s != %s). Giving up.\n", [expectedAfterHash UTF8String], [afterHash UTF8String]); + removeTree(destination); + return 1; + } + + fprintf(stderr, "\nDone!\n"); + return 0; +} diff --git a/Frameworks/Sparkle/Sparkle/SUBinaryDeltaCommon.h b/Frameworks/Sparkle/Sparkle/SUBinaryDeltaCommon.h new file mode 100644 index 000000000..4e330da7c --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUBinaryDeltaCommon.h @@ -0,0 +1,26 @@ +// +// SUBinaryDeltaCommon.h +// Sparkle +// +// Created by Mark Rowe on 2009-06-01. +// Copyright 2009 Mark Rowe. All rights reserved. +// + +#ifndef SUBINARYDELTACOMMON_H +#define SUBINARYDELTACOMMON_H + +#include + +@class NSString; +@class NSData; + +extern int binaryDeltaSupported(void); +extern int compareFiles(const FTSENT **a, const FTSENT **b); +extern NSData *hashOfFile(FTSENT *ent); +extern NSString *hashOfTree(NSString *path); +extern void removeTree(NSString *path); +extern void copyTree(NSString *source, NSString *dest); +extern NSString *pathRelativeToDirectory(NSString *directory, NSString *path); +NSString *temporaryFilename(NSString *base); +NSString *stringWithFileSystemRepresentation(const char*); +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUBinaryDeltaCommon.m b/Frameworks/Sparkle/Sparkle/SUBinaryDeltaCommon.m new file mode 100644 index 000000000..1caf70192 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUBinaryDeltaCommon.m @@ -0,0 +1,168 @@ +// +// SUBinaryDeltaCommon.m +// Sparkle +// +// Created by Mark Rowe on 2009-06-01. +// Copyright 2009 Mark Rowe. All rights reserved. +// + +#include "SUBinaryDeltaCommon.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +int binaryDeltaSupported(void) +{ + // OS X 10.4 didn't include libxar, so we link against it weakly. + // This checks whether libxar is available at runtime. + return xar_close != 0; +} + +int compareFiles(const FTSENT **a, const FTSENT **b) +{ + return strcoll((*a)->fts_name, (*b)->fts_name); +} + +NSString *pathRelativeToDirectory(NSString *directory, NSString *path) +{ + NSUInteger directoryLength = [directory length]; + if ([path hasPrefix:directory]) + return [path substringFromIndex:directoryLength]; + + return path; +} + +NSString *stringWithFileSystemRepresentation(const char *input) { + NSFileManager *fm = [NSFileManager defaultManager]; + return [fm stringWithFileSystemRepresentation:input length:strlen(input)]; +} + +NSString *temporaryFilename(NSString *base) +{ + NSString *template = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.XXXXXXXXXX", base]]; + const char *fsrepr = [template fileSystemRepresentation]; + + const size_t buffer_len = strlen(fsrepr) + 1; + char *buffer = (char *)malloc(buffer_len); + strlcpy(buffer, fsrepr, buffer_len); + + // mkstemp() can't be used, beause it returns a file descriptor, and XAR API requires a filename + NSString *ret = stringWithFileSystemRepresentation(mktemp(buffer)); + free(buffer); + return ret; +} + +static void _hashOfBuffer(unsigned char *hash, const char* buffer, ssize_t bufferLength) +{ + assert(bufferLength >= 0 && bufferLength <= UINT32_MAX); + CC_SHA1_CTX hashContext; + CC_SHA1_Init(&hashContext); + CC_SHA1_Update(&hashContext, buffer, (CC_LONG)bufferLength); + CC_SHA1_Final(hash, &hashContext); +} + +static void _hashOfFile(unsigned char* hash, FTSENT *ent) +{ + if (ent->fts_info == FTS_SL) { + char linkDestination[MAXPATHLEN + 1]; + ssize_t linkDestinationLength = readlink(ent->fts_path, linkDestination, MAXPATHLEN); + if (linkDestinationLength < 0) { + perror("readlink"); + return; + } + + _hashOfBuffer(hash, linkDestination, linkDestinationLength); + return; + } + + if (ent->fts_info == FTS_F) { + int fileDescriptor = open(ent->fts_path, O_RDONLY); + if (fileDescriptor == -1) { + perror("open"); + return; + } + + ssize_t fileSize = ent->fts_statp->st_size; + if (fileSize == 0) { + _hashOfBuffer(hash, NULL, 0); + close(fileDescriptor); + return; + } + + void *buffer = mmap(0, (size_t)fileSize, PROT_READ, MAP_FILE | MAP_PRIVATE, fileDescriptor, 0); + if (buffer == (void*)-1) { + close(fileDescriptor); + perror("mmap"); + return; + } + + _hashOfBuffer(hash, buffer, fileSize); + munmap(buffer, (size_t)fileSize); + close(fileDescriptor); + return; + } + + if (ent->fts_info == FTS_D) + memset(hash, 0xdd, CC_SHA1_DIGEST_LENGTH); +} + +NSData *hashOfFile(FTSENT *ent) +{ + unsigned char fileHash[CC_SHA1_DIGEST_LENGTH]; + _hashOfFile(fileHash, ent); + return [NSData dataWithBytes:fileHash length:CC_SHA1_DIGEST_LENGTH]; +} + +NSString *hashOfTree(NSString *path) +{ + const char *sourcePaths[] = {[path fileSystemRepresentation], 0}; + FTS *fts = fts_open((char* const*)sourcePaths, FTS_PHYSICAL | FTS_NOCHDIR, compareFiles); + if (!fts) { + perror("fts_open"); + return nil; + } + + CC_SHA1_CTX hashContext; + CC_SHA1_Init(&hashContext); + + FTSENT *ent = 0; + while ((ent = fts_read(fts))) { + if (ent->fts_info != FTS_F && ent->fts_info != FTS_SL) + continue; + + unsigned char fileHash[CC_SHA1_DIGEST_LENGTH]; + _hashOfFile(fileHash, ent); + CC_SHA1_Update(&hashContext, fileHash, sizeof(fileHash)); + + NSString *relativePath = pathRelativeToDirectory(path, stringWithFileSystemRepresentation(ent->fts_path)); + const char *relativePathBytes = [relativePath fileSystemRepresentation]; + CC_SHA1_Update(&hashContext, relativePathBytes, (CC_LONG)strlen(relativePathBytes)); + } + fts_close(fts); + + unsigned char hash[CC_SHA1_DIGEST_LENGTH]; + CC_SHA1_Final(hash, &hashContext); + + char hexHash[CC_SHA1_DIGEST_LENGTH * 2 + 1]; + size_t i; + for (i = 0; i < CC_SHA1_DIGEST_LENGTH; i++) + sprintf(hexHash + i * 2, "%02x", hash[i]); + + return @(hexHash); +} + +void removeTree(NSString *path) +{ + [[NSFileManager defaultManager] removeItemAtPath:path error:nil]; +} + +void copyTree(NSString *source, NSString *dest) +{ + [[NSFileManager defaultManager] copyItemAtPath:source toPath:dest error:nil]; +} diff --git a/Frameworks/Sparkle/Sparkle/SUBinaryDeltaTool.m b/Frameworks/Sparkle/Sparkle/SUBinaryDeltaTool.m new file mode 100644 index 000000000..8e46ead99 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUBinaryDeltaTool.m @@ -0,0 +1,266 @@ +// +// SUBinaryDeltaTool.m +// Sparkle +// +// Created by Mark Rowe on 2009-06-01. +// Copyright 2009 Mark Rowe. All rights reserved. +// + +#define _DARWIN_NO_64_BIT_INODE 1 + +#include "SUBinaryDeltaCommon.h" +#include "SUBinaryDeltaApply.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +extern int bsdiff(int argc, const char **argv); + +@interface CreateBinaryDeltaOperation : NSOperation +@property (copy) NSString *relativePath; +@property (strong) NSString *resultPath; +@property (strong) NSString *_fromPath; +@property (strong) NSString *_toPath; +- (id)initWithRelativePath:(NSString *)relativePath oldTree:(NSString *)oldTree newTree:(NSString *)newTree; +@end + +@implementation CreateBinaryDeltaOperation +@synthesize relativePath = _relativePath; +@synthesize resultPath = _resultPath; +@synthesize _fromPath = _fromPath; +@synthesize _toPath = _toPath; + +- (id)initWithRelativePath:(NSString *)relativePath oldTree:(NSString *)oldTree newTree:(NSString *)newTree +{ + if ((self = [super init])) { + self.relativePath = relativePath; + self._fromPath = [oldTree stringByAppendingPathComponent:relativePath]; + self._toPath = [newTree stringByAppendingPathComponent:relativePath]; + } + return self; +} + +- (void)main +{ + NSString *temporaryFile = temporaryFilename(@"BinaryDelta"); + const char *argv[] = {"/usr/bin/bsdiff", [self._fromPath fileSystemRepresentation], [self._toPath fileSystemRepresentation], [temporaryFile fileSystemRepresentation]}; + int result = bsdiff(4, argv); + if (!result) + self.resultPath = temporaryFile; +} + +@end + +static NSDictionary *infoForFile(FTSENT *ent) +{ + NSData *hash = hashOfFile(ent); + NSNumber *size = @0; + if (ent->fts_info != FTS_D) { + size = @(ent->fts_statp->st_size); + } + return @{@"hash": hash, @"type": @(ent->fts_info), @"size": size}; +} + +static NSString *absolutePath(NSString *path) +{ + NSURL *url = [[NSURL alloc] initFileURLWithPath:path]; + return [[url absoluteURL] path]; +} + +static NSString *temporaryPatchFile(NSString *patchFile) +{ + NSString *path = absolutePath(patchFile); + NSString *directory = [path stringByDeletingLastPathComponent]; + NSString *file = [path lastPathComponent]; + return [NSString stringWithFormat:@"%@/.%@.tmp", directory, file]; +} + +static BOOL shouldSkipDeltaCompression(NSString * __unused key, NSDictionary* originalInfo, NSDictionary *newInfo) +{ + unsigned long long fileSize = [newInfo[@"size"] unsignedLongLongValue]; + if (fileSize < 4096) { + return YES; + } + + if (!originalInfo) { + return YES; + } + + if ([originalInfo[@"type"] unsignedShortValue] != [newInfo[@"type"] unsignedShortValue]) { + return YES; + } + + return NO; +} + +static BOOL shouldDeleteThenExtract(NSString * __unused key, NSDictionary* originalInfo, NSDictionary *newInfo) +{ + if (!originalInfo) { + return NO; + } + + if ([originalInfo[@"type"] unsignedShortValue] != [newInfo[@"type"] unsignedShortValue]) { + return YES; + } + + return NO; +} + +int main(int argc, char **argv) +{ + @autoreleasepool { + if (argc != 5) { + usage: + fprintf(stderr, "Usage: BinaryDelta [create | apply] before-tree after-tree patch-file\n"); + exit(1); + } + + NSString *command = @(argv[1]); + NSString *oldPath = stringWithFileSystemRepresentation(argv[2]); + NSString *newPath = stringWithFileSystemRepresentation(argv[3]); + NSString *patchFile = stringWithFileSystemRepresentation(argv[4]); + + if ([command isEqualToString:@"apply"]) { + int result = applyBinaryDelta(oldPath, newPath, patchFile); + return result; + } + if (![command isEqualToString:@"create"]) { + goto usage; + } + + NSMutableDictionary *originalTreeState = [NSMutableDictionary dictionary]; + + const char *sourcePaths[] = {[oldPath fileSystemRepresentation], 0}; + FTS *fts = fts_open((char* const*)sourcePaths, FTS_PHYSICAL | FTS_NOCHDIR, compareFiles); + if (!fts) { + perror("fts_open"); + return 1; + } + + fprintf(stderr, "Processing %s...", [oldPath UTF8String]); + FTSENT *ent = 0; + while ((ent = fts_read(fts))) { + if (ent->fts_info != FTS_F && ent->fts_info != FTS_SL && ent->fts_info != FTS_D) { + continue; + } + + NSString *key = pathRelativeToDirectory(oldPath, stringWithFileSystemRepresentation(ent->fts_path)); + if (![key length]) { + continue; + } + + NSDictionary *info = infoForFile(ent); + originalTreeState[key] = info; + } + fts_close(fts); + + NSString *beforeHash = hashOfTree(oldPath); + + NSMutableDictionary *newTreeState = [NSMutableDictionary dictionary]; + for (NSString *key in originalTreeState) + { + newTreeState[key] = [NSNull null]; + } + + fprintf(stderr, "\nProcessing %s... ", [newPath UTF8String]); + sourcePaths[0] = [newPath fileSystemRepresentation]; + fts = fts_open((char* const*)sourcePaths, FTS_PHYSICAL | FTS_NOCHDIR, compareFiles); + if (!fts) { + perror("fts_open"); + return 1; + } + + + while ((ent = fts_read(fts))) { + if (ent->fts_info != FTS_F && ent->fts_info != FTS_SL && ent->fts_info != FTS_D) { + continue; + } + + NSString *key = pathRelativeToDirectory(newPath, stringWithFileSystemRepresentation(ent->fts_path)); + if (![key length]) { + continue; + } + + NSDictionary *info = infoForFile(ent); + NSDictionary *oldInfo = originalTreeState[key]; + + if ([info isEqual:oldInfo]) + [newTreeState removeObjectForKey:key]; + else + newTreeState[key] = info; + } + fts_close(fts); + + NSString *afterHash = hashOfTree(newPath); + + fprintf(stderr, "\nGenerating delta... "); + + NSString *temporaryFile = temporaryPatchFile(patchFile); + xar_t x = xar_open([temporaryFile fileSystemRepresentation], WRITE); + xar_opt_set(x, XAR_OPT_COMPRESSION, "bzip2"); + xar_subdoc_t attributes = xar_subdoc_new(x, "binary-delta-attributes"); + xar_subdoc_prop_set(attributes, "before-sha1", [beforeHash UTF8String]); + xar_subdoc_prop_set(attributes, "after-sha1", [afterHash UTF8String]); + + NSOperationQueue *deltaQueue = [[NSOperationQueue alloc] init]; + NSMutableArray *deltaOperations = [NSMutableArray array]; + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wselector" + // Xcode 5.1.1: compare: is clearly declared, must warn due to a compiler bug? + NSArray *keys = [[newTreeState allKeys] sortedArrayUsingSelector:@selector(compare:)]; +#pragma clang diagnostic pop + for (NSString* key in keys) { + id value = [newTreeState valueForKey:key]; + + if ([value isEqual:[NSNull null]]) { + xar_file_t newFile = xar_add_frombuffer(x, 0, [key fileSystemRepresentation], (char *)"", 1); + assert(newFile); + xar_prop_set(newFile, "delete", "true"); + continue; + } + + NSDictionary *originalInfo = originalTreeState[key]; + NSDictionary *newInfo = newTreeState[key]; + if (shouldSkipDeltaCompression(key, originalInfo, newInfo)) { + NSString *path = [newPath stringByAppendingPathComponent:key]; + xar_file_t newFile = xar_add_frompath(x, 0, [key fileSystemRepresentation], [path fileSystemRepresentation]); + assert(newFile); + if (shouldDeleteThenExtract(key, originalInfo, newInfo)) { + xar_prop_set(newFile, "delete-then-extract", "true"); + } + } else { + CreateBinaryDeltaOperation *operation = [[CreateBinaryDeltaOperation alloc] initWithRelativePath:key oldTree:oldPath newTree:newPath]; + [deltaQueue addOperation:operation]; + [deltaOperations addObject:operation]; + } + } + + [deltaQueue waitUntilAllOperationsAreFinished]; + + for (CreateBinaryDeltaOperation *operation in deltaOperations) { + NSString *resultPath = [operation resultPath]; + xar_file_t newFile = xar_add_frompath(x, 0, [[operation relativePath] fileSystemRepresentation], [resultPath fileSystemRepresentation]); + assert(newFile); + xar_prop_set(newFile, "binary-delta", "true"); + unlink([resultPath fileSystemRepresentation]); + } + + xar_close(x); + + unlink([patchFile fileSystemRepresentation]); + link([temporaryFile fileSystemRepresentation], [patchFile fileSystemRepresentation]); + unlink([temporaryFile fileSystemRepresentation]); + fprintf(stderr, "Done!\n"); + + return 0; + } +} diff --git a/Frameworks/Sparkle/Sparkle/SUBinaryDeltaUnarchiver.h b/Frameworks/Sparkle/Sparkle/SUBinaryDeltaUnarchiver.h new file mode 100644 index 000000000..1e71cbe49 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUBinaryDeltaUnarchiver.h @@ -0,0 +1,19 @@ +// +// SUBinaryDeltaUnarchiver.h +// Sparkle +// +// Created by Mark Rowe on 2009-06-03. +// Copyright 2009 Mark Rowe. All rights reserved. +// + +#ifndef SUBINARYDELTAUNARCHIVER_H +#define SUBINARYDELTAUNARCHIVER_H + +#import +#import "SUUnarchiver.h" + +@interface SUBinaryDeltaUnarchiver : SUUnarchiver + +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUBinaryDeltaUnarchiver.m b/Frameworks/Sparkle/Sparkle/SUBinaryDeltaUnarchiver.m new file mode 100644 index 000000000..df8b67ef2 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUBinaryDeltaUnarchiver.m @@ -0,0 +1,55 @@ +// +// SUBinaryDeltaUnarchiver.m +// Sparkle +// +// Created by Mark Rowe on 2009-06-03. +// Copyright 2009 Mark Rowe. All rights reserved. +// + +#import "SUBinaryDeltaCommon.h" +#import "SUBinaryDeltaUnarchiver.h" +#import "SUBinaryDeltaApply.h" +#import "SUUnarchiver_Private.h" +#import "SUHost.h" +#import "NTSynchronousTask.h" + +@implementation SUBinaryDeltaUnarchiver + ++ (BOOL)canUnarchivePath:(NSString *)path +{ + return binaryDeltaSupported() && [[path pathExtension] isEqualToString:@"delta"]; +} + +- (void)applyBinaryDelta +{ + @autoreleasepool { + NSString *sourcePath = [[self.updateHost bundle] bundlePath]; + NSString *targetPath = [[self.archivePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:[sourcePath lastPathComponent]]; + + int result = applyBinaryDelta(sourcePath, targetPath, self.archivePath); + if (!result) { + dispatch_async(dispatch_get_main_queue(), ^{ + [self notifyDelegateOfSuccess]; + }); + } + else { + dispatch_async(dispatch_get_main_queue(), ^{ + [self notifyDelegateOfFailure]; + }); + } + } +} + +- (void)start +{ + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + [self applyBinaryDelta]; + }); +} + ++ (void)load +{ + [self registerImplementation:self]; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUCodeSigningVerifier.h b/Frameworks/Sparkle/Sparkle/SUCodeSigningVerifier.h new file mode 100644 index 000000000..1f01d1b55 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUCodeSigningVerifier.h @@ -0,0 +1,19 @@ +// +// SUCodeSigningVerifier.h +// Sparkle +// +// Created by Andy Matuschak on 7/5/12. +// +// + +#ifndef SUCODESIGNINGVERIFIER_H +#define SUCODESIGNINGVERIFIER_H + +#import + +@interface SUCodeSigningVerifier : NSObject ++ (BOOL)codeSignatureIsValidAtPath:(NSString *)destinationPath error:(NSError **)error; ++ (BOOL)hostApplicationIsCodeSigned; +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUCodeSigningVerifier.m b/Frameworks/Sparkle/Sparkle/SUCodeSigningVerifier.m new file mode 100644 index 000000000..c720d6538 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUCodeSigningVerifier.m @@ -0,0 +1,117 @@ +// +// SUCodeSigningVerifier.m +// Sparkle +// +// Created by Andy Matuschak on 7/5/12. +// +// + +#include +#include +#import "SUCodeSigningVerifier.h" +#import "SULog.h" + +@implementation SUCodeSigningVerifier + ++ (BOOL)codeSignatureIsValidAtPath:(NSString *)destinationPath error:(NSError *__autoreleasing *)error +{ + OSStatus result; + SecRequirementRef requirement = NULL; + SecStaticCodeRef staticCode = NULL; + SecCodeRef hostCode = NULL; + NSBundle *newBundle; + CFErrorRef cfError = NULL; + if (error) { + *error = nil; + } + + result = SecCodeCopySelf(kSecCSDefaultFlags, &hostCode); + if (result != noErr) { + SULog(@"Failed to copy host code %d", result); + goto finally; + } + + result = SecCodeCopyDesignatedRequirement(hostCode, kSecCSDefaultFlags, &requirement); + if (result != noErr) { + SULog(@"Failed to copy designated requirement. Code Signing OSStatus code: %d", result); + goto finally; + } + + newBundle = [NSBundle bundleWithPath:destinationPath]; + if (!newBundle) { + SULog(@"Failed to load NSBundle for update"); + result = -1; + goto finally; + } + + result = SecStaticCodeCreateWithPath((__bridge CFURLRef)[newBundle executableURL], kSecCSDefaultFlags, &staticCode); + if (result != noErr) { + SULog(@"Failed to get static code %d", result); + goto finally; + } + + result = SecStaticCodeCheckValidityWithErrors(staticCode, kSecCSDefaultFlags | kSecCSCheckAllArchitectures, requirement, &cfError); + + if (cfError) { + NSError *tmpError = CFBridgingRelease(cfError); + if (error) *error = tmpError; + } + + if (result != noErr) { + if (result == errSecCSUnsigned) { + SULog(@"The host app is signed, but the new version of the app is not signed using Apple Code Signing. Please ensure that the new app is signed and that archiving did not corrupt the signature."); + } + if (result == errSecCSReqFailed) { + CFStringRef requirementString = nil; + if (SecRequirementCopyString(requirement, kSecCSDefaultFlags, &requirementString) == noErr) { + SULog(@"Code signature of the new version doesn't match the old version: %@. Please ensure that old and new app is signed using exactly the same certificate.", requirementString); + CFRelease(requirementString); + } + + [self logSigningInfoForCode:hostCode label:@"host info"]; + [self logSigningInfoForCode:staticCode label:@"new info"]; + } + } + +finally: + if (hostCode) CFRelease(hostCode); + if (staticCode) CFRelease(staticCode); + if (requirement) CFRelease(requirement); + return (result == noErr); +} + +static id valueOrNSNull(id value) { + return value ? value : [NSNull null]; +} + ++ (void)logSigningInfoForCode:(SecStaticCodeRef)code label:(NSString*)label { + CFDictionaryRef signingInfo = nil; + const SecCSFlags flags = kSecCSSigningInformation | kSecCSRequirementInformation | kSecCSDynamicInformation | kSecCSContentInformation; + if (SecCodeCopySigningInformation(code, flags, &signingInfo) == noErr) { + NSDictionary *signingDict = CFBridgingRelease(signingInfo); + NSMutableDictionary *relevantInfo = [NSMutableDictionary dictionary]; + for (NSString *key in @[@"format", @"identifier", @"requirements", @"teamid", @"signing-time"]) { + relevantInfo[key] = valueOrNSNull(signingDict[key]); + } + NSDictionary *infoPlist = signingDict[@"info-plist"]; + relevantInfo[@"version"] = valueOrNSNull(infoPlist[@"CFBundleShortVersionString"]); + relevantInfo[@"build"] = valueOrNSNull(infoPlist[@"CFBundleVersion"]); + SULog(@"%@: %@", label, relevantInfo); + } +} + ++ (BOOL)hostApplicationIsCodeSigned +{ + OSStatus result; + SecCodeRef hostCode = NULL; + result = SecCodeCopySelf(kSecCSDefaultFlags, &hostCode); + if (result != 0) return NO; + + SecRequirementRef requirement = NULL; + result = SecCodeCopyDesignatedRequirement(hostCode, kSecCSDefaultFlags, &requirement); + if (hostCode) CFRelease(hostCode); + if (requirement) CFRelease(requirement); + return (result == 0); +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUConstants.h b/Frameworks/Sparkle/Sparkle/SUConstants.h new file mode 100644 index 000000000..c07d9f409 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUConstants.h @@ -0,0 +1,87 @@ +// +// SUConstants.h +// Sparkle +// +// Created by Andy Matuschak on 3/16/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + + +#ifndef SUCONSTANTS_H +#define SUCONSTANTS_H + +// ----------------------------------------------------------------------------- +// Preprocessor flags: +// ----------------------------------------------------------------------------- + +// Sparkle usually doesn't allow downgrades as they're usually accidental, but +// if your app has a downgrade function or URL handler, turn this on: +#define PERMIT_AUTOMATED_DOWNGRADES 0 + +// If your app file on disk is named "MyApp 1.1b4", Sparkle usually updates it +// in place, giving you an app named 1.1b4 that is actually 1.2. Turn the +// following on to always reset the name back to "MyApp": +#define NORMALIZE_INSTALLED_APP_NAME 0 + + +#define TRY_TO_APPEND_VERSION_NUMBER 1 + +// ----------------------------------------------------------------------------- +// Notifications: +// ----------------------------------------------------------------------------- + +extern NSString *const SUTechnicalErrorInformationKey; + +// ----------------------------------------------------------------------------- +// PList keys:: +// ----------------------------------------------------------------------------- + +extern NSString *const SUFeedURLKey; +extern NSString *const SUHasLaunchedBeforeKey; +extern NSString *const SUShowReleaseNotesKey; +extern NSString *const SUSkippedVersionKey; +extern NSString *const SUScheduledCheckIntervalKey; +extern NSString *const SULastCheckTimeKey; +extern NSString *const SUExpectsDSASignatureKey; +extern NSString *const SUPublicDSAKeyKey; +extern NSString *const SUPublicDSAKeyFileKey; +extern NSString *const SUAutomaticallyUpdateKey; +extern NSString *const SUAllowsAutomaticUpdatesKey; +extern NSString *const SUEnableAutomaticChecksKey; +extern NSString *const SUEnableAutomaticChecksKeyOld; +extern NSString *const SUEnableSystemProfilingKey; +extern NSString *const SUSendProfileInfoKey; +extern NSString *const SULastProfileSubmitDateKey; +extern NSString *const SUPromptUserOnFirstLaunchKey; +extern NSString *const SUKeepDownloadOnFailedInstallKey; +extern NSString *const SUDefaultsDomainKey; +extern NSString *const SUFixedHTMLDisplaySizeKey __attribute__((deprecated("This key is obsolete and has no effect."))); + +// ----------------------------------------------------------------------------- +// Errors: +// ----------------------------------------------------------------------------- + +extern NSString *const SUSparkleErrorDomain; +// Appcast phase errors. +extern OSStatus SUAppcastParseError; +extern OSStatus SUNoUpdateError; +extern OSStatus SUAppcastError; +extern OSStatus SURunningFromDiskImageError; + +// Downlaod phase errors. +extern OSStatus SUTemporaryDirectoryError; + +// Extraction phase errors. +extern OSStatus SUUnarchivingError; +extern OSStatus SUSignatureError; + +// Installation phase errors. +extern OSStatus SUFileCopyFailure; +extern OSStatus SUAuthenticationFailure; +extern OSStatus SUMissingUpdateError; +extern OSStatus SUMissingInstallerToolError; +extern OSStatus SURelaunchError; +extern OSStatus SUInstallationError; +extern OSStatus SUDowngradeError; + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUConstants.m b/Frameworks/Sparkle/Sparkle/SUConstants.m new file mode 100644 index 000000000..832391efe --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUConstants.m @@ -0,0 +1,56 @@ +// +// SUConstants.m +// Sparkle +// +// Created by Andy Matuschak on 3/16/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#import "SUUpdater.h" + +#import "SUAppcast.h" +#import "SUAppcastItem.h" +#import "SUVersionComparisonProtocol.h" +#import "SUConstants.h" + +NSString *const SUTechnicalErrorInformationKey = @"SUTechnicalErrorInformation"; + +NSString *const SUHasLaunchedBeforeKey = @"SUHasLaunchedBefore"; +NSString *const SUFeedURLKey = @"SUFeedURL"; +NSString *const SUShowReleaseNotesKey = @"SUShowReleaseNotes"; +NSString *const SUSkippedVersionKey = @"SUSkippedVersion"; +NSString *const SUScheduledCheckIntervalKey = @"SUScheduledCheckInterval"; +NSString *const SULastCheckTimeKey = @"SULastCheckTime"; +NSString *const SUExpectsDSASignatureKey = @"SUExpectsDSASignature"; +NSString *const SUPublicDSAKeyKey = @"SUPublicDSAKey"; +NSString *const SUPublicDSAKeyFileKey = @"SUPublicDSAKeyFile"; +NSString *const SUAutomaticallyUpdateKey = @"SUAutomaticallyUpdate"; +NSString *const SUAllowsAutomaticUpdatesKey = @"SUAllowsAutomaticUpdates"; +NSString *const SUEnableSystemProfilingKey = @"SUEnableSystemProfiling"; +NSString *const SUEnableAutomaticChecksKey = @"SUEnableAutomaticChecks"; +NSString *const SUEnableAutomaticChecksKeyOld = @"SUCheckAtStartup"; +NSString *const SUSendProfileInfoKey = @"SUSendProfileInfo"; +NSString *const SULastProfileSubmitDateKey = @"SULastProfileSubmissionDate"; +NSString *const SUPromptUserOnFirstLaunchKey = @"SUPromptUserOnFirstLaunch"; +NSString *const SUFixedHTMLDisplaySizeKey = @"SUFixedHTMLDisplaySize"; +NSString *const SUKeepDownloadOnFailedInstallKey = @"SUKeepDownloadOnFailedInstall"; +NSString *const SUDefaultsDomainKey = @"SUDefaultsDomain"; + +NSString *const SUSparkleErrorDomain = @"SUSparkleErrorDomain"; +OSStatus SUAppcastParseError = 1000; +OSStatus SUNoUpdateError = 1001; +OSStatus SUAppcastError = 1002; +OSStatus SURunningFromDiskImageError = 1003; + +OSStatus SUTemporaryDirectoryError = 2000; + +OSStatus SUUnarchivingError = 3000; +OSStatus SUSignatureError = 3001; + +OSStatus SUFileCopyFailure = 4000; +OSStatus SUAuthenticationFailure = 4001; +OSStatus SUMissingUpdateError = 4002; +OSStatus SUMissingInstallerToolError = 4003; +OSStatus SURelaunchError = 4004; +OSStatus SUInstallationError = 4005; +OSStatus SUDowngradeError = 4006; diff --git a/Frameworks/Sparkle/Sparkle/SUDSAVerifier.h b/Frameworks/Sparkle/Sparkle/SUDSAVerifier.h new file mode 100644 index 000000000..3e876e19c --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUDSAVerifier.h @@ -0,0 +1,29 @@ +// +// SUDSAVerifier.h +// Sparkle +// +// Created by Andy Matuschak on 3/16/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// +// Includes code by Zach Waldowski on 10/18/13. +// Copyright 2014 Big Nerd Ranch. Licensed under MIT. +// +// Includes code from Plop by Mark Hamlin. +// Copyright 2011 Mark Hamlin. Licensed under BSD. +// + +#ifndef SUDSAVERIFIER_H +#define SUDSAVERIFIER_H + +@interface SUDSAVerifier : NSObject + ++ (BOOL)validatePath:(NSString *)path withEncodedDSASignature:(NSString *)encodedSignature withPublicDSAKey:(NSString *)pkeyString; + +- (instancetype)initWithPublicKeyData:(NSData *)data; + +- (BOOL)verifyFileAtPath:(NSString *)path signature:(NSData *)signature; +- (BOOL)verifyStream:(NSInputStream *)stream signature:(NSData *)signature; + +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUDSAVerifier.m b/Frameworks/Sparkle/Sparkle/SUDSAVerifier.m new file mode 100644 index 000000000..36893fee8 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUDSAVerifier.m @@ -0,0 +1,156 @@ +// +// SUDSAVerifier.m +// Sparkle +// +// Created by Andy Matuschak on 3/16/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// +// Includes code by Zach Waldowski on 10/18/13. +// Copyright 2014 Big Nerd Ranch. Licensed under MIT. +// +// Includes code from Plop by Mark Hamlin. +// Copyright 2011 Mark Hamlin. Licensed under BSD. +// + +#import "SUDSAVerifier.h" +#import "SULog.h" +#include + +@implementation SUDSAVerifier { + SecKeyRef _secKey; +} + ++ (BOOL)validatePath:(NSString *)path withEncodedDSASignature:(NSString *)encodedSignature withPublicDSAKey:(NSString *)pkeyString +{ + if (!encodedSignature) { + SULog(@"There is no DSA signature to check"); + return NO; + } + + if (!path) { + return NO; + } + + SUDSAVerifier *verifier = [[self alloc] initWithPublicKeyData:[pkeyString dataUsingEncoding:NSUTF8StringEncoding]]; + + if (!verifier) { + return NO; + } + + NSString *strippedSignature = [encodedSignature stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet]; + NSData *signature = [[NSData alloc] initWithBase64Encoding:strippedSignature]; + return [verifier verifyFileAtPath:path signature:signature]; +} + +- (instancetype)initWithPublicKeyData:(NSData *)data +{ + self = [super init]; + + if (!self || !data.length) { + SULog(@"Could not read public DSA key"); + return nil; + } + + SecExternalFormat format = kSecFormatOpenSSL; + SecExternalItemType itemType = kSecItemTypePublicKey; + CFArrayRef items = NULL; + + OSStatus status = SecItemImport((__bridge CFDataRef)data, NULL, &format, &itemType, 0, NULL, NULL, &items); + if (status != errSecSuccess || !items) { + if (items) { + CFRelease(items); + } + SULog(@"Public DSA key could not be imported: %d", status); + return nil; + } + + if (format == kSecFormatOpenSSL && itemType == kSecItemTypePublicKey && CFArrayGetCount(items) == 1) { + _secKey = (SecKeyRef)CFRetain(CFArrayGetValueAtIndex(items, 0)); + } + + CFRelease(items); + + return self; +} + +- (void)dealloc +{ + if (_secKey) { + CFRelease(_secKey); + } +} + +- (BOOL)verifyFileAtPath:(NSString *)path signature:(NSData *)signature +{ + if (!path.length) { + return NO; + } + NSInputStream *dataInputStream = [NSInputStream inputStreamWithFileAtPath:path]; + return [self verifyStream:dataInputStream signature:signature]; +} + +- (BOOL)verifyStream:(NSInputStream *)stream signature:(NSData *)signature +{ + if (!stream || !signature) { + return NO; + } + + __block SecGroupTransformRef group = SecTransformCreateGroupTransform(); + __block SecTransformRef dataReadTransform = NULL; + __block SecTransformRef dataDigestTransform = NULL; + __block SecTransformRef dataVerifyTransform = NULL; + __block CFErrorRef error = NULL; + + BOOL (^cleanup)(void) = ^{ + if (group) CFRelease(group); + if (dataReadTransform) CFRelease(dataReadTransform); + if (dataDigestTransform) CFRelease(dataDigestTransform); + if (dataVerifyTransform) CFRelease(dataVerifyTransform); + if (error) CFRelease(error); + return NO; + }; + + dataReadTransform = SecTransformCreateReadTransformWithReadStream((__bridge CFReadStreamRef)stream); + if (!dataReadTransform) { + SULog(@"File containing update archive could not be read (failed to create SecTransform for input stream)"); + return cleanup(); + } + + dataDigestTransform = SecDigestTransformCreate(kSecDigestSHA1, CC_SHA1_DIGEST_LENGTH, NULL); + if (!dataDigestTransform) { + return cleanup(); + } + + dataVerifyTransform = SecVerifyTransformCreate(_secKey, (__bridge CFDataRef)signature, &error); + if (!dataVerifyTransform || error) { + SULog(@"Could not understand format of the sugnature: %@; Signature data: %@", error, signature); + return cleanup(); + } + + SecTransformConnectTransforms(dataReadTransform, kSecTransformOutputAttributeName, dataDigestTransform, kSecTransformInputAttributeName, group, &error); + if (error) { + SULog(@"%@", error); + return cleanup(); + } + + SecTransformConnectTransforms(dataDigestTransform, kSecTransformOutputAttributeName, dataVerifyTransform, kSecTransformInputAttributeName, group, &error); + if (error) { + SULog(@"%@", error); + return cleanup(); + } + + NSNumber *result = CFBridgingRelease(SecTransformExecute(group, &error)); + if (error) { + SULog(@"DSA signature verification failed: %@", error); + return cleanup(); + } + + if (!result.boolValue) { + SULog(@"DSA signature does not match. Data of the update file being checked is different than data that has been signed, or the public key and the private key are not from the same set."); + } + + cleanup(); + return result.boolValue; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUDiskImageUnarchiver.h b/Frameworks/Sparkle/Sparkle/SUDiskImageUnarchiver.h new file mode 100644 index 000000000..7a8e9167a --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUDiskImageUnarchiver.h @@ -0,0 +1,19 @@ +// +// SUDiskImageUnarchiver.h +// Sparkle +// +// Created by Andy Matuschak on 6/16/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUDISKIMAGEUNARCHIVER_H +#define SUDISKIMAGEUNARCHIVER_H + +#import +#import "SUUnarchiver.h" + +@interface SUDiskImageUnarchiver : SUUnarchiver + +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUDiskImageUnarchiver.m b/Frameworks/Sparkle/Sparkle/SUDiskImageUnarchiver.m new file mode 100644 index 000000000..f5d39fd98 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUDiskImageUnarchiver.m @@ -0,0 +1,168 @@ +// +// SUDiskImageUnarchiver.m +// Sparkle +// +// Created by Andy Matuschak on 6/16/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUDiskImageUnarchiver.h" +#import "SUUnarchiver_Private.h" +#import "NTSynchronousTask.h" +#import "SULog.h" +#include + +@implementation SUDiskImageUnarchiver + ++ (BOOL)canUnarchivePath:(NSString *)path +{ + return [[path pathExtension] isEqualToString:@"dmg"]; +} + +// Called on a non-main thread. +- (void)extractDMG +{ + @autoreleasepool { + [self extractDMGWithPassword:nil]; + } +} + +// Called on a non-main thread. +- (void)extractDMGWithPassword:(NSString *)__unused password +{ + @autoreleasepool { + BOOL mountedSuccessfully = NO; + + SULog(@"Extracting %@ as a DMG", self.archivePath); + + // get a unique mount point path + NSString *mountPoint = nil; + FSRef tmpRef; + NSFileManager *manager; + NSError *error; + NSArray *contents; + // We have to declare these before a goto to prevent an error under ARC. + // No, we cannot have them in the dispatch_async calls, as the goto "jump enters + // lifetime of block which strongly captures a variable" + dispatch_block_t delegateFailure = ^{ + [self notifyDelegateOfFailure]; + }; + dispatch_block_t delegateSuccess = ^{ + [self notifyDelegateOfSuccess]; + }; + do + { + // Using NSUUID would make creating UUIDs be done in Cocoa, + // and thus managed under ARC. Sadly, the class is in 10.8 and later. + CFUUIDRef uuid = CFUUIDCreate(NULL); + if (uuid) + { + NSString *uuidString = CFBridgingRelease(CFUUIDCreateString(NULL, uuid)); + if (uuidString) + { + mountPoint = [@"/Volumes" stringByAppendingPathComponent:uuidString]; + } + CFRelease(uuid); + } + } + while (noErr == FSPathMakeRefWithOptions((UInt8 *)[mountPoint fileSystemRepresentation], kFSPathMakeRefDoNotFollowLeafSymlink, &tmpRef, NULL)); + + NSData *promptData = nil; + promptData = [NSData dataWithBytes:"yes\n" length:4]; + + NSArray *arguments = @[@"attach", self.archivePath, @"-mountpoint", mountPoint, /*@"-noverify",*/ @"-nobrowse", @"-noautoopen"]; + + NSData *output = nil; + NSInteger taskResult = -1; + @try + { + NTSynchronousTask *task = [[NTSynchronousTask alloc] init]; + + [task run:@"/usr/bin/hdiutil" directory:@"/" withArgs:arguments input:promptData]; + + taskResult = [task result]; + output = [[task output] copy]; + } + @catch (NSException *) + { + goto reportError; + } + + if (taskResult != 0) + { + NSString *resultStr = output ? [[NSString alloc] initWithData:output encoding:NSUTF8StringEncoding] : nil; + SULog(@"hdiutil failed with code: %ld data: <<%@>>", (long)taskResult, resultStr); + goto reportError; + } + mountedSuccessfully = YES; + + // Now that we've mounted it, we need to copy out its contents. + manager = [[NSFileManager alloc] init]; + contents = [manager contentsOfDirectoryAtPath:mountPoint error:&error]; + if (error) + { + SULog(@"Couldn't enumerate contents of archive mounted at %@: %@", mountPoint, error); + goto reportError; + } + + for (NSString *item in contents) + { + NSString *fromPath = [mountPoint stringByAppendingPathComponent:item]; + NSString *toPath = [[self.archivePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:item]; + + // We skip any files in the DMG which are not readable. + if (![manager isReadableFileAtPath:fromPath]) { + continue; + } + + SULog(@"copyItemAtPath:%@ toPath:%@", fromPath, toPath); + + if (![manager copyItemAtPath:fromPath toPath:toPath error:&error]) + { + SULog(@"Couldn't copy item: %@ : %@", error, error.userInfo ? error.userInfo : @""); + goto reportError; + } + } + + dispatch_async(dispatch_get_main_queue(), delegateSuccess); + goto finally; + + reportError: + dispatch_async(dispatch_get_main_queue(), delegateFailure); + + finally: + if (mountedSuccessfully) + [NSTask launchedTaskWithLaunchPath:@"/usr/bin/hdiutil" arguments:@[@"detach", mountPoint, @"-force"]]; + else + SULog(@"Can't mount DMG %@", self.archivePath); + } +} + +- (void)start +{ + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + [self extractDMG]; + }); +} + ++ (void)load +{ + [self registerImplementation:self]; +} + +- (BOOL)isEncrypted:(NSData *)resultData +{ + BOOL result = NO; + if(resultData) + { + NSString *data = [[NSString alloc] initWithData:resultData encoding:NSUTF8StringEncoding]; + + if ((data != nil) && !NSEqualRanges([data rangeOfString:@"passphrase-count"], NSMakeRange(NSNotFound, 0))) + { + result = YES; + } + } + return result; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUHost.h b/Frameworks/Sparkle/Sparkle/SUHost.h new file mode 100644 index 000000000..6e4e49f9a --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUHost.h @@ -0,0 +1,40 @@ +// +// SUHost.h +// Sparkle +// +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUUpdater.h" +#import "SUAppcast.h" +#import "SUAppcastItem.h" +#import "SUVersionComparisonProtocol.h" + +@interface SUHost : NSObject + +@property (strong, readonly) NSBundle *bundle; + ++ (NSString *)systemVersionString; + +- (instancetype)initWithBundle:(NSBundle *)aBundle; +@property (readonly, copy) NSString *bundlePath; +@property (readonly, copy) NSString *appSupportPath; +@property (readonly, copy) NSString *installationPath; +@property (readonly, copy) NSString *name; +@property (readonly, copy) NSString *version; +@property (readonly, copy) NSString *displayVersion; +@property (readonly, copy) NSImage *icon; +@property (getter=isRunningOnReadOnlyVolume, readonly) BOOL runningOnReadOnlyVolume; +@property (getter=isBackgroundApplication, readonly) BOOL backgroundApplication; +@property (readonly, copy) NSString *publicDSAKey; +@property (readonly, copy) NSArray *systemProfile; + +- (id)objectForInfoDictionaryKey:(NSString *)key; +- (BOOL)boolForInfoDictionaryKey:(NSString *)key; +- (id)objectForUserDefaultsKey:(NSString *)defaultName; +- (void)setObject:(id)value forUserDefaultsKey:(NSString *)defaultName; +- (BOOL)boolForUserDefaultsKey:(NSString *)defaultName; +- (void)setBool:(BOOL)value forUserDefaultsKey:(NSString *)defaultName; +- (id)objectForKey:(NSString *)key; +- (BOOL)boolForKey:(NSString *)key; +@end diff --git a/Frameworks/Sparkle/Sparkle/SUHost.m b/Frameworks/Sparkle/Sparkle/SUHost.m new file mode 100644 index 000000000..049b87cae --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUHost.m @@ -0,0 +1,276 @@ +// +// SUHost.m +// Sparkle +// +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUHost.h" + +#import "SUConstants.h" +#import "SUSystemProfiler.h" +#include // For statfs for isRunningOnReadOnlyVolume +#import "SULog.h" + +#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101000 +typedef struct { + NSInteger majorVersion; + NSInteger minorVersion; + NSInteger patchVersion; +} NSOperatingSystemVersion; +@interface NSProcessInfo () +- (NSOperatingSystemVersion)operatingSystemVersion; +@end +#endif + +@interface SUHost () + +@property (strong, readwrite) NSBundle *bundle; +@property (copy) NSString *defaultsDomain; +@property (assign) BOOL usesStandardUserDefaults; + +@end + +@implementation SUHost + +@synthesize bundle; +@synthesize defaultsDomain; +@synthesize usesStandardUserDefaults; + +- (instancetype)initWithBundle:(NSBundle *)aBundle +{ + if ((self = [super init])) + { + if (aBundle == nil) aBundle = [NSBundle mainBundle]; + self.bundle = aBundle; + if (![self.bundle bundleIdentifier]) { + SULog(@"Error: the bundle being updated at %@ has no CFBundleIdentifier! This will cause preference read/write to not work properly.", self.bundle); + } + + self.defaultsDomain = [self.bundle objectForInfoDictionaryKey:SUDefaultsDomainKey]; + if (!self.defaultsDomain) { + self.defaultsDomain = [self.bundle bundleIdentifier]; + } + + // If we're using the main bundle's defaults we'll use the standard user defaults mechanism, otherwise we have to get CF-y. + usesStandardUserDefaults = !self.defaultsDomain || [self.defaultsDomain isEqualToString:[[NSBundle mainBundle] bundleIdentifier]]; + } + return self; +} + + +- (NSString *)description { return [NSString stringWithFormat:@"%@ <%@, %@>", [self class], [self bundlePath], [self installationPath]]; } + +- (NSString *)bundlePath +{ + return [self.bundle bundlePath]; +} + +- (NSString *)appSupportPath +{ + NSArray *appSupportPaths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES); + NSString *appSupportPath = nil; + if (!appSupportPaths || [appSupportPaths count] == 0) + { + SULog(@"Failed to find app support directory! Using ~/Library/Application Support..."); + appSupportPath = [@"~/Library/Application Support" stringByExpandingTildeInPath]; + } + else { + appSupportPath = appSupportPaths[0]; + } + appSupportPath = [appSupportPath stringByAppendingPathComponent:[self name]]; + appSupportPath = [appSupportPath stringByAppendingPathComponent:@".Sparkle"]; + return appSupportPath; +} + +- (NSString *)installationPath +{ +#if NORMALIZE_INSTALLED_APP_NAME + // We'll install to "#{CFBundleName}.app", but only if that path doesn't already exist. If we're "Foo 4.2.app," and there's a "Foo.app" in this directory, we don't want to overwrite it! But if there's no "Foo.app," we'll take that name. + NSString *normalizedAppPath = [[[self.bundle bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", [self.bundle objectForInfoDictionaryKey:@"CFBundleName"], [[self.bundle bundlePath] pathExtension]]]; + if (![[NSFileManager defaultManager] fileExistsAtPath:[[[self.bundle bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", [self.bundle objectForInfoDictionaryKey:@"CFBundleName"], [[self.bundle bundlePath] pathExtension]]]]) { + return normalizedAppPath; + } +#endif + return [self.bundle bundlePath]; +} + +- (NSString *)name +{ + NSString *name = [self.bundle objectForInfoDictionaryKey:@"CFBundleDisplayName"]; + if (name) return name; + + name = [self objectForInfoDictionaryKey:@"CFBundleName"]; + if (name) return name; + + return [[[NSFileManager defaultManager] displayNameAtPath:[self.bundle bundlePath]] stringByDeletingPathExtension]; +} + +- (NSString *)version +{ + NSString *version = [self.bundle objectForInfoDictionaryKey:@"CFBundleVersion"]; + if (!version || [version isEqualToString:@""]) + [NSException raise:@"SUNoVersionException" format:@"This host (%@) has no CFBundleVersion! This attribute is required.", [self bundlePath]]; + return version; +} + +- (NSString *)displayVersion +{ + NSString *shortVersionString = [self.bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]; + if (shortVersionString) + return shortVersionString; + else + return [self version]; // Fall back on the normal version string. +} + +- (NSImage *)icon +{ + // Cache the application icon. + NSString *iconPath = [self.bundle pathForResource:[self.bundle objectForInfoDictionaryKey:@"CFBundleIconFile"] ofType:@"icns"]; + // According to the OS X docs, "CFBundleIconFile - This key identifies the file containing + // the icon for the bundle. The filename you specify does not need to include the .icns + // extension, although it may." + // + // However, if it *does* include the '.icns' the above method fails (tested on OS X 10.3.9) so we'll also try: + if (!iconPath) { + iconPath = [self.bundle pathForResource:[self.bundle objectForInfoDictionaryKey:@"CFBundleIconFile"] ofType:nil]; + } + NSImage *icon = [[NSImage alloc] initWithContentsOfFile:iconPath]; + // Use a default icon if none is defined. + if (!icon) { + BOOL isMainBundle = (self.bundle == [NSBundle mainBundle]); + + NSString *fileType = isMainBundle ? (NSString *)kUTTypeApplication : (NSString *)kUTTypeBundle; + icon = [[NSWorkspace sharedWorkspace] iconForFileType:fileType]; + } + return icon; +} + +- (BOOL)isRunningOnReadOnlyVolume +{ + struct statfs statfs_info; + statfs([[self.bundle bundlePath] fileSystemRepresentation], &statfs_info); + return (statfs_info.f_flags & MNT_RDONLY); +} + +- (BOOL)isBackgroundApplication +{ + return ([[NSApplication sharedApplication] activationPolicy] == NSApplicationActivationPolicyAccessory); +} + +- (NSString *)publicDSAKey +{ + // Maybe the key is just a string in the Info.plist. + NSString *key = [self.bundle objectForInfoDictionaryKey:SUPublicDSAKeyKey]; + if (key) { return key; } + + // More likely, we've got a reference to a Resources file by filename: + NSString *keyFilename = [self objectForInfoDictionaryKey:SUPublicDSAKeyFileKey]; + if (!keyFilename) { return nil; } + NSError *ignoreErr = nil; + return [NSString stringWithContentsOfFile:[self.bundle pathForResource:keyFilename ofType:nil] encoding:NSASCIIStringEncoding error:&ignoreErr]; +} + +- (NSArray *)systemProfile +{ + return [[SUSystemProfiler sharedSystemProfiler] systemProfileArrayForHost:self]; +} + +- (id)objectForInfoDictionaryKey:(NSString *)key +{ + return [self.bundle objectForInfoDictionaryKey:key]; +} + +- (BOOL)boolForInfoDictionaryKey:(NSString *)key +{ + return [[self objectForInfoDictionaryKey:key] boolValue]; +} + +- (id)objectForUserDefaultsKey:(NSString *)defaultName +{ + if (!defaultName || !self.defaultsDomain) { + return nil; + } + + // Under Tiger, CFPreferencesCopyAppValue doesn't get values from NSRegistrationDomain, so anything + // passed into -[NSUserDefaults registerDefaults:] is ignored. The following line falls + // back to using NSUserDefaults, but only if the host bundle is the main bundle. + if (self.usesStandardUserDefaults) { + return [[NSUserDefaults standardUserDefaults] objectForKey:defaultName]; + } + + CFPropertyListRef obj = CFPreferencesCopyAppValue((__bridge CFStringRef)defaultName, (__bridge CFStringRef)self.defaultsDomain); + return CFBridgingRelease(obj); +} + +- (void)setObject:(id)value forUserDefaultsKey:(NSString *)defaultName +{ + if (self.usesStandardUserDefaults) + { + [[NSUserDefaults standardUserDefaults] setObject:value forKey:defaultName]; + } + else + { + CFPreferencesSetValue((__bridge CFStringRef)defaultName, (__bridge CFPropertyListRef)(value), (__bridge CFStringRef)self.defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost); + CFPreferencesSynchronize((__bridge CFStringRef)self.defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost); + } +} + +- (BOOL)boolForUserDefaultsKey:(NSString *)defaultName +{ + if (self.usesStandardUserDefaults) { + return [[NSUserDefaults standardUserDefaults] boolForKey:defaultName]; + } + + BOOL value; + CFPropertyListRef plr = CFPreferencesCopyAppValue((__bridge CFStringRef)defaultName, (__bridge CFStringRef)self.defaultsDomain); + if (plr == NULL) { + value = NO; + } + else + { + value = (BOOL)CFBooleanGetValue((CFBooleanRef)plr); + CFRelease(plr); + } + return value; +} + +- (void)setBool:(BOOL)value forUserDefaultsKey:(NSString *)defaultName +{ + if (self.usesStandardUserDefaults) + { + [[NSUserDefaults standardUserDefaults] setBool:value forKey:defaultName]; + } + else + { + CFPreferencesSetValue((__bridge CFStringRef)defaultName, (__bridge CFBooleanRef) @(value), (__bridge CFStringRef)self.defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost); + CFPreferencesSynchronize((__bridge CFStringRef)self.defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost); + } +} + +- (id)objectForKey:(NSString *)key { + return [self objectForUserDefaultsKey:key] ? [self objectForUserDefaultsKey:key] : [self objectForInfoDictionaryKey:key]; +} + +- (BOOL)boolForKey:(NSString *)key { + return [self objectForUserDefaultsKey:key] ? [self boolForUserDefaultsKey:key] : [self boolForInfoDictionaryKey:key]; +} + ++ (NSString *)systemVersionString +{ +#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1090 // Present in 10.9 despite NS_AVAILABLE's claims +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wselector" + // Xcode 5.1.1: operatingSystemVersion is clearly declared, must warn due to a compiler bug? + if (![NSProcessInfo instancesRespondToSelector:@selector(operatingSystemVersion)]) +#pragma clang diagnostic pop + { + NSURL *coreServices = [[NSFileManager defaultManager] URLForDirectory:NSCoreServiceDirectory inDomain:NSSystemDomainMask appropriateForURL:nil create:NO error:nil]; + return [NSDictionary dictionaryWithContentsOfURL:[coreServices URLByAppendingPathComponent:@"SystemVersion.plist"]][@"ProductVersion"]; + } +#endif + NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion]; + return [NSString stringWithFormat:@"%ld.%ld.%ld", (long)version.majorVersion, (long)version.minorVersion, (long)version.patchVersion]; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUInstaller.h b/Frameworks/Sparkle/Sparkle/SUInstaller.h new file mode 100644 index 000000000..c1b01898e --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUInstaller.h @@ -0,0 +1,32 @@ +// +// SUInstaller.h +// Sparkle +// +// Created by Andy Matuschak on 4/10/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUINSTALLER_H +#define SUINSTALLER_H + +#import +#import "SUVersionComparisonProtocol.h" + +@protocol SUInstallerDelegate; + +@class SUHost; +@interface SUInstaller : NSObject + ++ (NSString *)appPathInUpdateFolder:(NSString *)updateFolder forHost:(SUHost *)host; ++ (void)installFromUpdateFolder:(NSString *)updateFolder overHost:(SUHost *)host installationPath:(NSString *)installationPath delegate:(id)delegate versionComparator:(id)comparator; ++ (void)finishInstallationToPath:(NSString *)installationPath withResult:(BOOL)result host:(SUHost *)host error:(NSError *)error delegate:(id)delegate; ++ (NSString *)updateFolder; + +@end + +@protocol SUInstallerDelegate +- (void)installerFinishedForHost:(SUHost *)host; +- (void)installerForHost:(SUHost *)host failedWithError:(NSError *)error; +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUInstaller.m b/Frameworks/Sparkle/Sparkle/SUInstaller.m new file mode 100644 index 000000000..4960a4e37 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUInstaller.m @@ -0,0 +1,181 @@ +// +// SUInstaller.m +// Sparkle +// +// Created by Andy Matuschak on 4/10/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUInstaller.h" +#import "SUPlainInstaller.h" +#import "SUPackageInstaller.h" +#import "SUHost.h" +#import "SUConstants.h" +#import "SULog.h" + + +@implementation SUInstaller + +static NSString *sUpdateFolder = nil; + ++ (NSString *)updateFolder +{ + return sUpdateFolder; +} + ++ (BOOL)isAliasFolderAtPath:(NSString *)path +{ + FSRef fileRef; + OSStatus err = noErr; + Boolean aliasFileFlag = false, folderFlag = false; + NSURL *fileURL = [NSURL fileURLWithPath:path]; + + if (FALSE == CFURLGetFSRef((CFURLRef)fileURL, &fileRef)) + err = coreFoundationUnknownErr; + + if (noErr == err) + err = FSIsAliasFile(&fileRef, &aliasFileFlag, &folderFlag); + + if (noErr == err) + return !!(aliasFileFlag && folderFlag); + else + return NO; +} + ++ (NSString *)installSourcePathInUpdateFolder:(NSString *)inUpdateFolder forHost:(SUHost *)host isPackage:(BOOL *)isPackagePtr +{ + // Search subdirectories for the application + NSString *currentFile, + *newAppDownloadPath = nil, + *bundleFileName = [[host bundlePath] lastPathComponent], + *alternateBundleFileName = [[host name] stringByAppendingPathExtension:[[host bundlePath] pathExtension]]; + BOOL isPackage = NO; + NSString *fallbackPackagePath = nil; + NSDirectoryEnumerator *dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:inUpdateFolder]; + + sUpdateFolder = inUpdateFolder; + + while ((currentFile = [dirEnum nextObject])) + { + NSString *currentPath = [inUpdateFolder stringByAppendingPathComponent:currentFile]; + if ([[currentFile lastPathComponent] isEqualToString:bundleFileName] || + [[currentFile lastPathComponent] isEqualToString:alternateBundleFileName]) // We found one! + { + isPackage = NO; + newAppDownloadPath = currentPath; + break; + } + else if ([[currentFile pathExtension] isEqualToString:@"pkg"] || + [[currentFile pathExtension] isEqualToString:@"mpkg"]) + { + if ([[[currentFile lastPathComponent] stringByDeletingPathExtension] isEqualToString:[bundleFileName stringByDeletingPathExtension]]) + { + isPackage = YES; + newAppDownloadPath = currentPath; + break; + } + else + { + // Remember any other non-matching packages we have seen should we need to use one of them as a fallback. + fallbackPackagePath = currentPath; + } + } + else + { + // Try matching on bundle identifiers in case the user has changed the name of the host app + NSBundle *incomingBundle = [NSBundle bundleWithPath:currentPath]; + if(incomingBundle && [[incomingBundle bundleIdentifier] isEqualToString:[[host bundle] bundleIdentifier]]) + { + isPackage = NO; + newAppDownloadPath = currentPath; + break; + } + } + + // Some DMGs have symlinks into /Applications! That's no good! + if ([self isAliasFolderAtPath:currentPath]) + [dirEnum skipDescendents]; + } + + // We don't have a valid path. Try to use the fallback package. + + if (newAppDownloadPath == nil && fallbackPackagePath != nil) + { + isPackage = YES; + newAppDownloadPath = fallbackPackagePath; + } + + if (isPackagePtr) *isPackagePtr = isPackage; + return newAppDownloadPath; +} + ++ (NSString *)appPathInUpdateFolder:(NSString *)updateFolder forHost:(SUHost *)host +{ + BOOL isPackage = NO; + NSString *path = [self installSourcePathInUpdateFolder:updateFolder forHost:host isPackage:&isPackage]; + return isPackage ? nil : path; +} + ++ (void)installFromUpdateFolder:(NSString *)inUpdateFolder overHost:(SUHost *)host installationPath:(NSString *)installationPath delegate:(id)delegate versionComparator:(id)comparator +{ + BOOL isPackage = NO; + NSString *newAppDownloadPath = [self installSourcePathInUpdateFolder:inUpdateFolder forHost:host isPackage:&isPackage]; + + if (newAppDownloadPath == nil) + { + [self finishInstallationToPath:installationPath withResult:NO host:host error:[NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: @"Couldn't find an appropriate update in the downloaded package." }] delegate:delegate]; + } + else + { + [(isPackage ? [SUPackageInstaller class] : [SUPlainInstaller class])performInstallationToPath:installationPath fromPath:newAppDownloadPath host:host delegate:delegate versionComparator:comparator]; + } +} + ++ (void)mdimportInstallationPath:(NSString *)installationPath +{ + // *** GETS CALLED ON NON-MAIN THREAD! + + SULog(@"mdimporting"); + + NSTask *mdimport = [[NSTask alloc] init]; + [mdimport setLaunchPath:@"/usr/bin/mdimport"]; + [mdimport setArguments:@[installationPath]]; + @try + { + [mdimport launch]; + [mdimport waitUntilExit]; + } + @catch (NSException *launchException) + { + // No big deal. + SULog(@"Error: %@", [launchException description]); + } +} + + +#define SUNotifyDictHostKey @"SUNotifyDictHost" +#define SUNotifyDictErrorKey @"SUNotifyDictError" +#define SUNotifyDictDelegateKey @"SUNotifyDictDelegate" + ++ (void)finishInstallationToPath:(NSString *)installationPath withResult:(BOOL)result host:(SUHost *)host error:(NSError *)error delegate:(id)delegate +{ + if (result) + { + [self mdimportInstallationPath:installationPath]; + if ([delegate respondsToSelector:@selector(installerFinishedForHost:)]) { + dispatch_async(dispatch_get_main_queue(), ^{ + [delegate installerFinishedForHost:host]; + }); + } + } + else + { + if ([delegate respondsToSelector:@selector(installerForHost:failedWithError:)]) { + dispatch_async(dispatch_get_main_queue(), ^{ + [delegate installerForHost:host failedWithError:error]; + }); + } + } +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SULog.h b/Frameworks/Sparkle/Sparkle/SULog.h new file mode 100644 index 000000000..e3559b5ea --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SULog.h @@ -0,0 +1,31 @@ +/* + * SULog.h + * EyeTV + * + * Created by Uli Kusterer on 12/03/2009. + * Copyright 2008 Elgato Systems GmbH. All rights reserved. + * + */ + +/* + Log output for troubleshooting Sparkle failures on end-user machines. + Your tech support will hug you if you tell them about this. +*/ + +#pragma once + +// ----------------------------------------------------------------------------- +// Headers: +// ----------------------------------------------------------------------------- + +#include + + +// ----------------------------------------------------------------------------- +// Prototypes: +// ----------------------------------------------------------------------------- + +void SUClearLog(void); +void SULog(NSString *format, ...) NS_FORMAT_FUNCTION(1, 2); + + diff --git a/Frameworks/Sparkle/Sparkle/SULog.m b/Frameworks/Sparkle/Sparkle/SULog.m new file mode 100644 index 000000000..267e67893 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SULog.m @@ -0,0 +1,75 @@ +/* + * SULog.m + * EyeTV + * + * Created by Uli Kusterer on 12/03/2009. + * Copyright 2009 Elgato Systems GmbH. All rights reserved. + * + */ + +// ----------------------------------------------------------------------------- +// Headers: +// ----------------------------------------------------------------------------- + +#include "SULog.h" + + +// ----------------------------------------------------------------------------- +// Constants: +// ----------------------------------------------------------------------------- + +#define LOG_FILE_PATH @"~/Library/Logs/SparkleUpdateLog.log" + + +// ----------------------------------------------------------------------------- +// SUClearLog: +// Erase the log at the start of an update. We don't want to litter the +// user's hard disk with logging data that's mostly unused, so each app +// should clear the log before it starts updating, so only the most recent +// update is kept around. +// +// TAKES: +// sender - Object that sent this message, typically of type X. +// +// GIVES: +// param - who owns the returned value? +// result - same here. +// ----------------------------------------------------------------------------- + +void SUClearLog(void) +{ + FILE *logfile = fopen([[LOG_FILE_PATH stringByExpandingTildeInPath] fileSystemRepresentation], "w"); + if (logfile) { + fclose(logfile); + } +} + + +// ----------------------------------------------------------------------------- +// SULog: +// Like NSLog, but logs to one specific log file. Each line is prefixed +// with the current date and time, to help in regressing issues. +// +// TAKES: +// format - NSLog/printf-style format string. +// ... - More parameters depending on format string's contents. +// ----------------------------------------------------------------------------- + +void SULog(NSString *format, ...) +{ + va_list ap; + va_start(ap, format); + NSString *theStr = [[NSString alloc] initWithFormat:format arguments:ap]; + NSLog(@"Sparkle: %@", theStr); + + FILE *logfile = fopen([[LOG_FILE_PATH stringByExpandingTildeInPath] fileSystemRepresentation], "a"); + if (logfile) { + theStr = [NSString stringWithFormat:@"%@: %@\n", [NSDate date], theStr]; + NSData *theData = [theStr dataUsingEncoding:NSUTF8StringEncoding]; + fwrite([theData bytes], 1, [theData length], logfile); + fclose(logfile); + } + va_end(ap); +} + + diff --git a/Frameworks/Sparkle/Sparkle/SUPackageInstaller.h b/Frameworks/Sparkle/Sparkle/SUPackageInstaller.h new file mode 100644 index 000000000..04b500eea --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUPackageInstaller.h @@ -0,0 +1,22 @@ +// +// SUPackageInstaller.h +// Sparkle +// +// Created by Andy Matuschak on 4/10/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUPACKAGEINSTALLER_H +#define SUPACKAGEINSTALLER_H + +#import "SUUpdater.h" + +#import "SUAppcast.h" +#import "SUAppcastItem.h" +#import "SUVersionComparisonProtocol.h" +#import "SUPlainInstaller.h" + +@interface SUPackageInstaller : SUPlainInstaller +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUPackageInstaller.m b/Frameworks/Sparkle/Sparkle/SUPackageInstaller.m new file mode 100644 index 000000000..23ad954f5 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUPackageInstaller.m @@ -0,0 +1,41 @@ +// +// SUPackageInstaller.m +// Sparkle +// +// Created by Andy Matuschak on 4/10/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUPackageInstaller.h" +#import +#import "SUConstants.h" + +@implementation SUPackageInstaller + ++ (void)performInstallationToPath:(NSString *)installationPath fromPath:(NSString *)path host:(SUHost *)host delegate:(id)delegate versionComparator:(id)__unused comparator +{ + // Run installer using the "open" command to ensure it is launched in front of current application. + // -W = wait until the app has quit. + // -n = Open another instance if already open. + // -b = app bundle identifier + NSString *command = @"/usr/bin/open"; + NSArray *args = @[@"-W", @"-n", @"-b", @"com.apple.installer", path]; + + if (![[NSFileManager defaultManager] fileExistsAtPath:command]) { + NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingInstallerToolError userInfo:@{ NSLocalizedDescriptionKey: @"Couldn't find Apple's installer tool!" }]; + [self finishInstallationToPath:installationPath withResult:NO host:host error:error delegate:delegate]; + return; + } + + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + NSTask *installer = [NSTask launchedTaskWithLaunchPath:command arguments:args]; + [installer waitUntilExit]; + + // Known bug: if the installation fails or is canceled, Sparkle goes ahead and restarts, thinking everything is fine. + dispatch_async(dispatch_get_main_queue(), ^{ + [self finishInstallationToPath:installationPath withResult:YES host:host error:nil delegate:delegate]; + }); + }); +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUPipedUnarchiver.h b/Frameworks/Sparkle/Sparkle/SUPipedUnarchiver.h new file mode 100644 index 000000000..7304ba0ab --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUPipedUnarchiver.h @@ -0,0 +1,19 @@ +// +// SUPipedUnarchiver.h +// Sparkle +// +// Created by Andy Matuschak on 6/16/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUPIPEDUNARCHIVER_H +#define SUPIPEDUNARCHIVER_H + +#import +#import "SUUnarchiver.h" + +@interface SUPipedUnarchiver : SUUnarchiver + +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUPipedUnarchiver.m b/Frameworks/Sparkle/Sparkle/SUPipedUnarchiver.m new file mode 100644 index 000000000..1f2f68eaa --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUPipedUnarchiver.m @@ -0,0 +1,151 @@ +// +// SUPipedUnarchiver.m +// Sparkle +// +// Created by Andy Matuschak on 6/16/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUPipedUnarchiver.h" +#import "SUUnarchiver_Private.h" +#import "SULog.h" + + +@implementation SUPipedUnarchiver + ++ (SEL)selectorConformingToTypeOfPath:(NSString *)path +{ + static NSDictionary *typeSelectorDictionary; + if (!typeSelectorDictionary) + typeSelectorDictionary = @{ @".zip": @"extractZIP", + @".tar": @"extractTAR", + @".tar.gz": @"extractTGZ", + @".tgz": @"extractTGZ", + @".tar.bz2": @"extractTBZ", + @".tbz": @"extractTBZ" }; + + NSString *lastPathComponent = [path lastPathComponent]; + for (NSString *currentType in typeSelectorDictionary) + { + if ([currentType length] > [lastPathComponent length]) continue; + if ([[lastPathComponent substringFromIndex:[lastPathComponent length] - [currentType length]] isEqualToString:currentType]) + return NSSelectorFromString(typeSelectorDictionary[currentType]); + } + return NULL; +} + +- (void)start +{ + [NSThread detachNewThreadSelector:[[self class] selectorConformingToTypeOfPath:self.archivePath] toTarget:self withObject:nil]; +} + ++ (BOOL)canUnarchivePath:(NSString *)path +{ + return ([self selectorConformingToTypeOfPath:path] != nil); +} + +// This method abstracts the types that use a command line tool piping data from stdin. +- (void)extractArchivePipingDataToCommand:(NSString *)command +{ + // *** GETS CALLED ON NON-MAIN THREAD!!! + @autoreleasepool { + FILE *fp = NULL, *cmdFP = NULL; + char *oldDestinationString = NULL; + // We have to declare these before a goto to prevent an error under ARC. + // No, we cannot have them in the dispatch_async calls, as the goto "jump enters + // lifetime of block which strongly captures a variable" + dispatch_block_t delegateSuccess = ^{ + [self notifyDelegateOfSuccess]; + }; + dispatch_block_t delegateFailure = ^{ + [self notifyDelegateOfFailure]; + }; + + SULog(@"Extracting %@ using '%@'", self.archivePath, command); + + // Get the file size. + NSNumber *fs = [[NSFileManager defaultManager] attributesOfItemAtPath:self.archivePath error:nil][NSFileSize]; + if (fs == nil) goto reportError; + + // Thank you, Allan Odgaard! + // (who wrote the following extraction alg.) + fp = fopen([self.archivePath fileSystemRepresentation], "r"); + if (!fp) goto reportError; + + oldDestinationString = getenv("DESTINATION"); + setenv("DESTINATION", [[self.archivePath stringByDeletingLastPathComponent] fileSystemRepresentation], 1); + cmdFP = popen([command fileSystemRepresentation], "w"); + size_t written; + if (!cmdFP) goto reportError; + + char buf[32 * 1024]; + size_t len; + while((len = fread(buf, 1, 32*1024, fp))) + { + written = fwrite(buf, 1, len, cmdFP); + if( written < len ) + { + pclose(cmdFP); + goto reportError; + } + + dispatch_async(dispatch_get_main_queue(), ^{ + [self notifyDelegateOfExtractedLength:len]; + }); + } + pclose(cmdFP); + + if (ferror(fp)) { + goto reportError; + } + + dispatch_async(dispatch_get_main_queue(), delegateSuccess); + goto finally; + + reportError: + dispatch_async(dispatch_get_main_queue(), delegateFailure); + + finally: + if (fp) + fclose(fp); + if (oldDestinationString) + setenv("DESTINATION", oldDestinationString, 1); + else + unsetenv("DESTINATION"); + } +} + +- (void)extractTAR +{ + // *** GETS CALLED ON NON-MAIN THREAD!!! + + [self extractArchivePipingDataToCommand:@"tar -xC \"$DESTINATION\""]; +} + +- (void)extractTGZ +{ + // *** GETS CALLED ON NON-MAIN THREAD!!! + + [self extractArchivePipingDataToCommand:@"tar -zxC \"$DESTINATION\""]; +} + +- (void)extractTBZ +{ + // *** GETS CALLED ON NON-MAIN THREAD!!! + + [self extractArchivePipingDataToCommand:@"tar -jxC \"$DESTINATION\""]; +} + +- (void)extractZIP +{ + // *** GETS CALLED ON NON-MAIN THREAD!!! + + [self extractArchivePipingDataToCommand:@"ditto -x -k - \"$DESTINATION\""]; +} + ++ (void)load +{ + [self registerImplementation:self]; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUPlainInstaller.h b/Frameworks/Sparkle/Sparkle/SUPlainInstaller.h new file mode 100644 index 000000000..bb7827a67 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUPlainInstaller.h @@ -0,0 +1,28 @@ +// +// SUPlainInstaller.h +// Sparkle +// +// Created by Andy Matuschak on 4/10/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUPLAININSTALLER_H +#define SUPLAININSTALLER_H + +#import "SUUpdater.h" + +#import "SUAppcast.h" +#import "SUAppcastItem.h" +#import "SUVersionComparisonProtocol.h" +#import "SUInstaller.h" +#import "SUVersionComparisonProtocol.h" + +@class SUHost; + +@interface SUPlainInstaller : SUInstaller + ++ (void)performInstallationToPath:(NSString *)installationPath fromPath:(NSString *)path host:(SUHost *)host delegate:(id)delegate versionComparator:(id)comparator; + +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUPlainInstaller.m b/Frameworks/Sparkle/Sparkle/SUPlainInstaller.m new file mode 100644 index 000000000..8eb98a3bf --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUPlainInstaller.m @@ -0,0 +1,50 @@ +// +// SUPlainInstaller.m +// Sparkle +// +// Created by Andy Matuschak on 4/10/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUPlainInstaller.h" +#import "SUPlainInstallerInternals.h" +#import "SUConstants.h" +#import "SUHost.h" + +@implementation SUPlainInstaller + ++ (void)performInstallationToPath:(NSString *)installationPath fromPath:(NSString *)path host:(SUHost *)host delegate:(id)delegate versionComparator:(id)comparator +{ +// Prevent malicious downgrades: +#if !PERMIT_AUTOMATED_DOWNGRADES + if ([comparator compareVersion:[host version] toVersion:[[NSBundle bundleWithPath:path] objectForInfoDictionaryKey:@"CFBundleVersion"]] == NSOrderedDescending) + { + NSString *errorMessage = [NSString stringWithFormat:@"Sparkle Updater: Possible attack in progress! Attempting to \"upgrade\" from %@ to %@. Aborting update.", [host version], [[NSBundle bundleWithPath:path] objectForInfoDictionaryKey:@"CFBundleVersion"]]; + NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUDowngradeError userInfo:@{ NSLocalizedDescriptionKey: errorMessage }]; + [self finishInstallationToPath:installationPath withResult:NO host:host error:error delegate:delegate]; + return; + } +#endif + + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + NSError *error = nil; + NSString *oldPath = [host bundlePath]; + NSString *tempName = [self temporaryNameForPath:[host installationPath]]; + + BOOL result = [self copyPathWithAuthentication:path overPath:installationPath temporaryName:tempName error:&error]; + + if (result) { + BOOL haveOld = [[NSFileManager defaultManager] fileExistsAtPath:oldPath]; + BOOL differentFromNew = ![oldPath isEqualToString:installationPath]; + if (haveOld && differentFromNew) { + [self _movePathToTrash:oldPath]; // On success, trash old copy if there's still one due to renaming. + } + } + + dispatch_async(dispatch_get_main_queue(), ^{ + [self finishInstallationToPath:installationPath withResult:result host:host error:error delegate:delegate]; + }); + }); +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUPlainInstallerInternals.h b/Frameworks/Sparkle/Sparkle/SUPlainInstallerInternals.h new file mode 100644 index 000000000..1bb645d40 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUPlainInstallerInternals.h @@ -0,0 +1,22 @@ +// +// SUPlainInstallerInternals.m +// Sparkle +// +// Created by Andy Matuschak on 3/9/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUPLAININSTALLERINTERNALS_H +#define SUPLAININSTALLERINTERNALS_H + +#import "SUPlainInstaller.h" + +@interface SUPlainInstaller (Internals) ++ (NSString *)temporaryNameForPath:(NSString *)path; ++ (BOOL)copyPathWithAuthentication:(NSString *)src overPath:(NSString *)dst temporaryName:(NSString *)tmp error:(NSError **)error; ++ (void)_movePathToTrash:(NSString *)path; ++ (BOOL)_removeFileAtPath:(NSString *)path error:(NSError **)error; ++ (BOOL)_removeFileAtPathWithForcedAuthentication:(NSString *)src error:(NSError **)error; +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUPlainInstallerInternals.m b/Frameworks/Sparkle/Sparkle/SUPlainInstallerInternals.m new file mode 100644 index 000000000..aa942d6f9 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUPlainInstallerInternals.m @@ -0,0 +1,619 @@ +// +// SUPlainInstallerInternals.m +// Sparkle +// +// Created by Andy Matuschak on 3/9/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#import "SUUpdater.h" + +#import "SUAppcast.h" +#import "SUAppcastItem.h" +#import "SUVersionComparisonProtocol.h" +#import "SUPlainInstallerInternals.h" +#import "SUConstants.h" +#import "SULog.h" + +#include +#include +#include +#include +#include +#include +#include + +#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101000 +extern NSString *const NSURLQuarantinePropertiesKey WEAK_IMPORT_ATTRIBUTE; +#endif + +static inline void PerformOnMainThreadSync(dispatch_block_t theBlock) +{ + if ([NSThread isMainThread]) { + theBlock(); + } else { + dispatch_sync(dispatch_get_main_queue(), theBlock); + } +} + +@interface SUPlainInstaller (MMExtendedAttributes) +// Removes the directory tree rooted at |root| from the file quarantine. +// The quarantine was introduced on OS X 10.5 and is described at: +// +// http://developer.apple.com/releasenotes/Carbon/RN-LaunchServices/index.html +//#apple_ref/doc/uid/TP40001369-DontLinkElementID_2 +// +// If |root| is not a directory, then it alone is removed from the quarantine. +// Symbolic links, including |root| if it is a symbolic link, will not be +// traversed. +// +// Ordinarily, the quarantine is managed by calling LSSetItemAttribute +// to set the kLSItemQuarantineProperties attribute to a dictionary specifying +// the quarantine properties to be applied. However, it does not appear to be +// possible to remove an item from the quarantine directly through any public +// Launch Services calls. Instead, this method takes advantage of the fact +// that the quarantine is implemented in part by setting an extended attribute, +// "com.apple.quarantine", on affected files. Removing this attribute is +// sufficient to remove files from the quarantine. ++ (void)releaseFromQuarantine:(NSString *)root; +@end + +// Authorization code based on generous contribution from Allan Odgaard. Thanks, Allan! +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" // this is terrible; will fix later probably +static BOOL AuthorizationExecuteWithPrivilegesAndWait(AuthorizationRef authorization, const char *executablePath, AuthorizationFlags options, const char *const *arguments) +{ + // *** MUST BE SAFE TO CALL ON NON-MAIN THREAD! + + sig_t oldSigChildHandler = signal(SIGCHLD, SIG_DFL); + BOOL returnValue = YES; + + if (AuthorizationExecuteWithPrivileges(authorization, executablePath, options, (char* const*)arguments, NULL) == errAuthorizationSuccess) + { + int status; + pid_t pid = wait(&status); + if (pid == -1 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) + returnValue = NO; + } + else + returnValue = NO; + + signal(SIGCHLD, oldSigChildHandler); + return returnValue; +} +#pragma clang diagnostic pop + +@implementation SUPlainInstaller (Internals) + ++ (NSString *)temporaryNameForPath:(NSString *)path +{ + // Let's try to read the version number so the filename will be more meaningful. + NSString *postFix; + NSString *version; + if ((version = [[NSBundle bundleWithPath:path] objectForInfoDictionaryKey:@"CFBundleVersion"]) && ![version isEqualToString:@""]) + { + NSMutableCharacterSet *validCharacters = [NSMutableCharacterSet alphanumericCharacterSet]; + [validCharacters formUnionWithCharacterSet:[NSCharacterSet characterSetWithCharactersInString:@".-()"]]; + postFix = [version stringByTrimmingCharactersInSet:[validCharacters invertedSet]]; + } + else + postFix = @"old"; + NSString *prefix = [[path stringByDeletingPathExtension] stringByAppendingFormat:@" (%@)", postFix]; + NSString *tempDir = [prefix stringByAppendingPathExtension:[path pathExtension]]; + // Now let's make sure we get a unique path. + unsigned int cnt = 2; + while ([[NSFileManager defaultManager] fileExistsAtPath:tempDir] && cnt <= 999) + tempDir = [NSString stringWithFormat:@"%@ %u.%@", prefix, cnt++, [path pathExtension]]; + return [tempDir lastPathComponent]; +} + ++ (NSString *)_temporaryCopyNameForPath:(NSString *)path didFindTrash:(BOOL *)outDidFindTrash +{ + // *** MUST BE SAFE TO CALL ON NON-MAIN THREAD! + NSString *tempDir = nil; + + UInt8 trashPath[MAXPATHLEN + 1] = { 0 }; + FSRef trashRef, pathRef; + FSVolumeRefNum vSrcRefNum = kFSInvalidVolumeRefNum; + FSCatalogInfo catInfo; + memset(&catInfo, 0, sizeof(catInfo)); + OSStatus err = FSPathMakeRef((UInt8 *)[path fileSystemRepresentation], &pathRef, NULL); + if( err == noErr ) + { + err = FSGetCatalogInfo(&pathRef, kFSCatInfoVolume, &catInfo, NULL, NULL, NULL); + vSrcRefNum = catInfo.volume; + } + if (err == noErr) + err = FSFindFolder(vSrcRefNum, kTrashFolderType, kCreateFolder, &trashRef); + if (err == noErr) + err = FSGetCatalogInfo(&trashRef, kFSCatInfoVolume, &catInfo, NULL, NULL, NULL); + if (err == noErr && vSrcRefNum != catInfo.volume) + err = nsvErr; // Couldn't find a trash folder on same volume as given path. Docs say this may happen in the future. + if (err == noErr) + err = FSRefMakePath(&trashRef, trashPath, MAXPATHLEN); + if (err == noErr) + tempDir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:(char *)trashPath length:strlen((char *)trashPath)]; + if (outDidFindTrash) + *outDidFindTrash = (tempDir != nil); + if (!tempDir) + tempDir = [path stringByDeletingLastPathComponent]; + +// Let's try to read the version number so the filename will be more meaningful. +#if TRY_TO_APPEND_VERSION_NUMBER + NSString *postFix = nil; + NSString *version = nil; + if ((version = [[NSBundle bundleWithPath: path] objectForInfoDictionaryKey:@"CFBundleVersion"]) && ![version isEqualToString:@""]) + { + NSMutableCharacterSet *validCharacters = [NSMutableCharacterSet alphanumericCharacterSet]; + [validCharacters formUnionWithCharacterSet:[NSCharacterSet characterSetWithCharactersInString:@".-()"]]; + postFix = [version stringByTrimmingCharactersInSet:[validCharacters invertedSet]]; + } + else { + postFix = @"old"; + } + NSString *prefix = [NSString stringWithFormat:@"%@ (%@)", [[path lastPathComponent] stringByDeletingPathExtension], postFix]; +#else + NSString *prefix = [[path lastPathComponent] stringByDeletingPathExtension]; +#endif + NSString *tempName = [prefix stringByAppendingPathExtension:[path pathExtension]]; + tempDir = [tempDir stringByAppendingPathComponent:tempName]; + + // Now let's make sure we get a unique path. + int cnt = 2; + while ([[NSFileManager defaultManager] fileExistsAtPath:tempDir] && cnt <= 9999) { + tempDir = [[tempDir stringByDeletingLastPathComponent] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@ %d.%@", prefix, cnt++, [path pathExtension]]]; + } + + return tempDir; +} + ++ (BOOL)_copyPathWithForcedAuthentication:(NSString *)src toPath:(NSString *)dst temporaryPath:(NSString *)tmp error:(NSError *__autoreleasing *)error +{ + // *** MUST BE SAFE TO CALL ON NON-MAIN THREAD! + + const char *srcPath = [src fileSystemRepresentation]; + const char *tmpPath = [tmp fileSystemRepresentation]; + const char *dstPath = [dst fileSystemRepresentation]; + + struct stat dstSB; + if (stat(dstPath, &dstSB) != 0) // Doesn't exist yet, try containing folder. + { + const char *dstDirPath = [[dst stringByDeletingLastPathComponent] fileSystemRepresentation]; + if( stat(dstDirPath, &dstSB) != 0 ) + { + NSString *errorMessage = [NSString stringWithFormat:@"Stat on %@ during authenticated file copy failed.", dst]; + if (error != NULL) + *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUFileCopyFailure userInfo:@{ NSLocalizedDescriptionKey: errorMessage }]; + return NO; + } + } + + AuthorizationRef auth = NULL; + OSStatus authStat = errAuthorizationDenied; + while (authStat == errAuthorizationDenied) { + authStat = AuthorizationCreate(NULL, + kAuthorizationEmptyEnvironment, + kAuthorizationFlagDefaults, + &auth); + } + + BOOL res = NO; + if (authStat == errAuthorizationSuccess) { + res = YES; + + char uidgid[42]; + snprintf(uidgid, sizeof(uidgid), "%u:%u", + dstSB.st_uid, dstSB.st_gid); + + // If the currently-running application is trusted, the new + // version should be trusted as well. Remove it from the + // quarantine to avoid a delay at launch, and to avoid + // presenting the user with a confusing trust dialog. + // + // This needs to be done after the application is moved to its + // new home with "mv" in case it's moved across filesystems: if + // that happens, "mv" actually performs a copy and may result + // in the application being quarantined. It also needs to be + // done before "chown" changes ownership, because the ownership + // change will almost certainly make it impossible to change + // attributes to release the files from the quarantine. + if (res) + { + SULog(@"releaseFromQuarantine"); + PerformOnMainThreadSync(^{ + [self releaseFromQuarantine:src]; + }); + } + + if (res) // Set permissions while it's still in source, so we have it with working and correct perms when it arrives at destination. + { + const char *coParams[] = { "-R", uidgid, srcPath, NULL }; + res = AuthorizationExecuteWithPrivilegesAndWait(auth, "/usr/sbin/chown", kAuthorizationFlagDefaults, coParams); + if (!res) + SULog(@"chown -R %s %s failed.", uidgid, srcPath); + } + + BOOL haveDst = [[NSFileManager defaultManager] fileExistsAtPath:dst]; + if (res && haveDst) // If there's something at our tmp path (previous failed update or whatever) delete that first. + { + const char *rmParams[] = { "-rf", tmpPath, NULL }; + res = AuthorizationExecuteWithPrivilegesAndWait(auth, "/bin/rm", kAuthorizationFlagDefaults, rmParams); + if (!res) + SULog(@"rm failed"); + } + + if (res && haveDst) // Move old exe to tmp path. + { + const char *mvParams[] = { "-f", dstPath, tmpPath, NULL }; + res = AuthorizationExecuteWithPrivilegesAndWait(auth, "/bin/mv", kAuthorizationFlagDefaults, mvParams); + if (!res) + SULog(@"mv 1 failed"); + } + + if (res) // Move new exe to old exe's path. + { + const char *mvParams2[] = { "-f", srcPath, dstPath, NULL }; + res = AuthorizationExecuteWithPrivilegesAndWait(auth, "/bin/mv", kAuthorizationFlagDefaults, mvParams2); + if (!res) + SULog(@"mv 2 failed"); + } + + // if( res && haveDst /*&& !foundTrash*/ ) // If we managed to put the old exe in the trash, leave it there for the user to delete or recover. + // { // ... Otherwise we better delete it, wouldn't want dozens of old versions lying around next to the new one. + // const char* rmParams2[] = { "-rf", tmpPath, NULL }; + // res = AuthorizationExecuteWithPrivilegesAndWait( auth, "/bin/rm", kAuthorizationFlagDefaults, rmParams2 ); + // } + + AuthorizationFree(auth, 0); + + // If the currently-running application is trusted, the new + // version should be trusted as well. Remove it from the + // quarantine to avoid a delay at launch, and to avoid + // presenting the user with a confusing trust dialog. + // + // This needs to be done after the application is moved to its + // new home with "mv" in case it's moved across filesystems: if + // that happens, "mv" actually performs a copy and may result + // in the application being quarantined. + if (res) + { + SULog(@"releaseFromQuarantine after installing"); + PerformOnMainThreadSync(^{ + [self releaseFromQuarantine:dst]; + }); + } + + if (!res) + { + // Something went wrong somewhere along the way, but we're not sure exactly where. + NSString *errorMessage = [NSString stringWithFormat:@"Authenticated file copy from %@ to %@ failed.", src, dst]; + if (error != nil) + *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUAuthenticationFailure userInfo:@{ NSLocalizedDescriptionKey: errorMessage }]; + } + } + else + { + if (error != nil) + *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUAuthenticationFailure userInfo:@{ NSLocalizedDescriptionKey: @"Couldn't get permission to authenticate." }]; + } + return res; +} + ++ (BOOL)_movePathWithForcedAuthentication:(NSString *)src toPath:(NSString *)dst error:(NSError *__autoreleasing *)error +{ + // *** MUST BE SAFE TO CALL ON NON-MAIN THREAD! + + const char *srcPath = [src fileSystemRepresentation]; + const char *dstPath = [dst fileSystemRepresentation]; + const char *dstContainerPath = [[dst stringByDeletingLastPathComponent] fileSystemRepresentation]; + + struct stat dstSB; + stat(dstContainerPath, &dstSB); + + AuthorizationRef auth = NULL; + OSStatus authStat = errAuthorizationDenied; + while( authStat == errAuthorizationDenied ) + { + authStat = AuthorizationCreate(NULL, + kAuthorizationEmptyEnvironment, + kAuthorizationFlagDefaults, + &auth); + } + + BOOL res = NO; + if (authStat == errAuthorizationSuccess) + { + res = YES; + + char uidgid[42]; + snprintf(uidgid, sizeof(uidgid), "%d:%d", + dstSB.st_uid, dstSB.st_gid); + + if (res) // Set permissions while it's still in source, so we have it with working and correct perms when it arrives at destination. + { + const char *coParams[] = { "-R", uidgid, srcPath, NULL }; + res = AuthorizationExecuteWithPrivilegesAndWait(auth, "/usr/sbin/chown", kAuthorizationFlagDefaults, coParams); + if (!res) + SULog(@"Can't set permissions"); + } + + BOOL haveDst = [[NSFileManager defaultManager] fileExistsAtPath:dst]; + if (res && haveDst) // If there's something at our tmp path (previous failed update or whatever) delete that first. + { + const char *rmParams[] = { "-rf", dstPath, NULL }; + res = AuthorizationExecuteWithPrivilegesAndWait(auth, "/bin/rm", kAuthorizationFlagDefaults, rmParams); + if (!res) + SULog(@"Can't remove destination file"); + } + + if (res) // Move!. + { + const char *mvParams[] = { "-f", srcPath, dstPath, NULL }; + res = AuthorizationExecuteWithPrivilegesAndWait(auth, "/bin/mv", kAuthorizationFlagDefaults, mvParams); + if (!res) + SULog(@"Can't move source file"); + } + + AuthorizationFree(auth, 0); + + if (!res) + { + // Something went wrong somewhere along the way, but we're not sure exactly where. + NSString *errorMessage = [NSString stringWithFormat:@"Authenticated file move from %@ to %@ failed.", src, dst]; + if (error != NULL) + *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUAuthenticationFailure userInfo:@{ NSLocalizedDescriptionKey: errorMessage }]; + } + } + else + { + if (error != NULL) + *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUAuthenticationFailure userInfo:@{ NSLocalizedDescriptionKey: @"Couldn't get permission to authenticate." }]; + } + return res; +} + + ++ (BOOL)_removeFileAtPathWithForcedAuthentication:(NSString *)src error:(NSError *__autoreleasing *)error +{ + // *** MUST BE SAFE TO CALL ON NON-MAIN THREAD! + + const char *srcPath = [src fileSystemRepresentation]; + + AuthorizationRef auth = NULL; + OSStatus authStat = errAuthorizationDenied; + while( authStat == errAuthorizationDenied ) + { + authStat = AuthorizationCreate(NULL, + kAuthorizationEmptyEnvironment, + kAuthorizationFlagDefaults, + &auth); + } + + BOOL res = NO; + if (authStat == errAuthorizationSuccess) + { + res = YES; + + if (res) // If there's something at our tmp path (previous failed update or whatever) delete that first. + { + const char *rmParams[] = { "-rf", srcPath, NULL }; + res = AuthorizationExecuteWithPrivilegesAndWait(auth, "/bin/rm", kAuthorizationFlagDefaults, rmParams); + if (!res) + SULog(@"Can't remove destination file"); + } + + AuthorizationFree(auth, 0); + + if (!res) + { + // Something went wrong somewhere along the way, but we're not sure exactly where. + NSString *errorMessage = [NSString stringWithFormat:@"Authenticated file remove from %@ failed.", src]; + if (error != NULL) + *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUAuthenticationFailure userInfo:@{ NSLocalizedDescriptionKey: errorMessage }]; + } + } + else + { + if (error != NULL) + *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUAuthenticationFailure userInfo:@{ NSLocalizedDescriptionKey: @"Couldn't get permission to authenticate." }]; + } + return res; +} + ++ (BOOL)_removeFileAtPath:(NSString *)path error:(NSError *__autoreleasing *)error +{ + BOOL success = YES; + if( ![[NSFileManager defaultManager] removeItemAtPath: path error: NULL] ) + { + success = [self _removeFileAtPathWithForcedAuthentication:path error:error]; + } + + return success; +} + ++ (void)_movePathToTrash:(NSString *)path +{ + //SULog(@"Moving %@ to the trash.", path); + NSInteger tag = 0; + if (![[NSWorkspace sharedWorkspace] performFileOperation:NSWorkspaceRecycleOperation source:[path stringByDeletingLastPathComponent] destination:@"" files:@[[path lastPathComponent]] tag:&tag]) + { + BOOL didFindTrash = NO; + NSString *trashPath = [self _temporaryCopyNameForPath:path didFindTrash:&didFindTrash]; + if( didFindTrash ) + { + NSError *err = nil; + if (![self _movePathWithForcedAuthentication:path toPath:trashPath error:&err]) { + SULog(@"Error: couldn't move %@ to the trash (%@). %@", path, trashPath, err); + } + } + else { + SULog(@"Error: couldn't move %@ to the trash. This is often a sign of a permissions error.", path); + } + } +} + ++ (BOOL)copyPathWithAuthentication:(NSString *)src overPath:(NSString *)dst temporaryName:(NSString *)__unused tmp error:(NSError *__autoreleasing *)error +{ + FSRef srcRef, dstRef, dstDirRef, tmpDirRef; + OSStatus err; + BOOL hadFileAtDest = NO, didFindTrash = NO; + NSString *tmpPath = [self _temporaryCopyNameForPath:dst didFindTrash:&didFindTrash]; + + // Make FSRef for destination: + err = FSPathMakeRefWithOptions((UInt8 *)[dst fileSystemRepresentation], kFSPathMakeRefDoNotFollowLeafSymlink, &dstRef, NULL); + hadFileAtDest = (err == noErr); // There is a file at the destination, move it aside. If we normalized the name, we might not get here, so don't error. + if( hadFileAtDest ) + { + if (0 != access([dst fileSystemRepresentation], W_OK) || 0 != access([[dst stringByDeletingLastPathComponent] fileSystemRepresentation], W_OK)) + { + return [self _copyPathWithForcedAuthentication:src toPath:dst temporaryPath:tmpPath error:error]; + } + } + else + { + if (0 != access([[dst stringByDeletingLastPathComponent] fileSystemRepresentation], W_OK) + || 0 != access([[[dst stringByDeletingLastPathComponent] stringByDeletingLastPathComponent] fileSystemRepresentation], W_OK)) + { + return [self _copyPathWithForcedAuthentication:src toPath:dst temporaryPath:tmpPath error:error]; + } + } + + if( hadFileAtDest ) + { + err = FSPathMakeRef((UInt8 *)[[tmpPath stringByDeletingLastPathComponent] fileSystemRepresentation], &tmpDirRef, NULL); + if (err != noErr) + FSPathMakeRef((UInt8 *)[[dst stringByDeletingLastPathComponent] fileSystemRepresentation], &tmpDirRef, NULL); + } + + err = FSPathMakeRef((UInt8 *)[[dst stringByDeletingLastPathComponent] fileSystemRepresentation], &dstDirRef, NULL); + + if (err == noErr && hadFileAtDest) + { + NSFileManager *manager = [[NSFileManager alloc] init]; + BOOL success = [manager moveItemAtPath:dst toPath:tmpPath error:error]; + if (!success && hadFileAtDest) + { + if (error != NULL) + *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUFileCopyFailure userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Couldn't move %@ to %@.", dst, tmpPath] }]; + return NO; + } + } + + err = FSPathMakeRef((UInt8 *)[src fileSystemRepresentation], &srcRef, NULL); + if (err == noErr) + { + NSFileManager *manager = [[NSFileManager alloc] init]; + BOOL success = [manager copyItemAtPath:src toPath:dst error:error]; + if (!success) + { + // We better move the old version back to its old location + if (hadFileAtDest) { + success = [manager moveItemAtPath:tmpPath toPath:dst error:error]; + } + if (!success && error != NULL) + *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUFileCopyFailure userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Couldn't move %@ to %@.", dst, tmpPath] }]; + return NO; + + } + } + + // If the currently-running application is trusted, the new + // version should be trusted as well. Remove it from the + // quarantine to avoid a delay at launch, and to avoid + // presenting the user with a confusing trust dialog. + // + // This needs to be done after the application is moved to its + // new home in case it's moved across filesystems: if that + // happens, the move is actually a copy, and it may result + // in the application being quarantined. + PerformOnMainThreadSync(^{ + [self releaseFromQuarantine:dst]; + }); + + return YES; +} + +@end + +#include +#include +#include + +@implementation SUPlainInstaller (MMExtendedAttributes) + ++ (int)removeXAttr:(NSString *)name + fromFile:(NSString *)file + options:(int)options +{ + // *** MUST BE SAFE TO CALL ON NON-MAIN THREAD! + + const char *path = NULL; + const char *attr = [name cStringUsingEncoding:NSASCIIStringEncoding]; + @try { + path = [file fileSystemRepresentation]; + } + @catch (id) { + // -[NSString fileSystemRepresentation] throws an exception if it's + // unable to convert the string to something suitable. Map that to + // EDOM, "argument out of domain", which sort of conveys that there + // was a conversion failure. + errno = EDOM; + return -1; + } + + return removexattr(path, attr, options); +} + ++ (void)releaseFromQuarantine:(NSString *)root +{ + // *** MUST BE SAFE TO CALL ON NON-MAIN THREAD! + + NSFileManager *manager = [NSFileManager defaultManager]; +#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101000 + if (!&NSURLQuarantinePropertiesKey) { + NSString *const quarantineAttribute = (NSString*)kLSItemQuarantineProperties; + const int removeXAttrOptions = XATTR_NOFOLLOW; + + [self removeXAttr:quarantineAttribute + fromFile:root + options:removeXAttrOptions]; + + // Only recurse if it's actually a directory. Don't recurse into a + // root-level symbolic link. + NSDictionary *rootAttributes = [manager attributesOfItemAtPath:root error:nil]; + NSString *rootType = rootAttributes[NSFileType]; + + if (rootType == NSFileTypeDirectory) { + // The NSDirectoryEnumerator will avoid recursing into any contained + // symbolic links, so no further type checks are needed. + NSDirectoryEnumerator *directoryEnumerator = [manager enumeratorAtPath:root]; + NSString *file = nil; + while ((file = [directoryEnumerator nextObject])) { + [self removeXAttr:quarantineAttribute + fromFile:[root stringByAppendingPathComponent:file] + options:removeXAttrOptions]; + } + } + return; + } +#endif + NSURL *rootURL = [NSURL fileURLWithPath:root]; + [rootURL setResourceValue:[NSNull null] forKey:NSURLQuarantinePropertiesKey error:NULL]; + + // Only recurse if it's actually a directory. Don't recurse into a + // root-level symbolic link. + NSDictionary *rootAttributes = [manager attributesOfItemAtPath:root error:nil]; + NSString *rootType = rootAttributes[NSFileType]; + + if (rootType == NSFileTypeDirectory) { + // The NSDirectoryEnumerator will avoid recursing into any contained + // symbolic links, so no further type checks are needed. + NSDirectoryEnumerator *directoryEnumerator = [manager enumeratorAtURL:rootURL includingPropertiesForKeys:nil options:(NSDirectoryEnumerationOptions)0 errorHandler:nil]; + + for (NSURL *file in directoryEnumerator) { + [file setResourceValue:[NSNull null] forKey:NSURLQuarantinePropertiesKey error:NULL]; + } + } +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUProbingUpdateDriver.h b/Frameworks/Sparkle/Sparkle/SUProbingUpdateDriver.h new file mode 100644 index 000000000..bf897c8c4 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUProbingUpdateDriver.h @@ -0,0 +1,19 @@ +// +// SUProbingUpdateDriver.h +// Sparkle +// +// Created by Andy Matuschak on 5/7/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUPROBINGUPDATEDRIVER_H +#define SUPROBINGUPDATEDRIVER_H + +#import +#import "SUBasicUpdateDriver.h" + +// This replaces the old SUStatusChecker. +@interface SUProbingUpdateDriver : SUBasicUpdateDriver +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUProbingUpdateDriver.m b/Frameworks/Sparkle/Sparkle/SUProbingUpdateDriver.m new file mode 100644 index 000000000..1fde6c6d9 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUProbingUpdateDriver.m @@ -0,0 +1,39 @@ +// +// SUProbingUpdateDriver.m +// Sparkle +// +// Created by Andy Matuschak on 5/7/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUProbingUpdateDriver.h" +#import "SUUpdater.h" + +@implementation SUProbingUpdateDriver + +// Stop as soon as we have an answer! Since the superclass implementations are not called, we are responsible for notifying the delegate. + +- (void)didFindValidUpdate +{ + id updaterDelegate = [self.updater delegate]; + + if ([updaterDelegate respondsToSelector:@selector(updater:didFindValidUpdate:)]) + [updaterDelegate updater:self.updater didFindValidUpdate:self.updateItem]; + NSDictionary *userInfo = (self.updateItem != nil) ? @{ SUUpdaterAppcastItemNotificationKey: self.updateItem } : nil; + [[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterDidFindValidUpdateNotification object:self.updater userInfo:userInfo]; + [self abortUpdate]; +} + +- (void)didNotFindUpdate +{ + id updaterDelegate = [self.updater delegate]; + + if ([updaterDelegate respondsToSelector:@selector(updaterDidNotFindUpdate:)]) { + [updaterDelegate updaterDidNotFindUpdate:self.updater]; + } + [[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterDidNotFindUpdateNotification object:self.updater]; + + [self abortUpdate]; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUScheduledUpdateDriver.h b/Frameworks/Sparkle/Sparkle/SUScheduledUpdateDriver.h new file mode 100644 index 000000000..dfdde51f6 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUScheduledUpdateDriver.h @@ -0,0 +1,19 @@ +// +// SUScheduledUpdateDriver.h +// Sparkle +// +// Created by Andy Matuschak on 5/6/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUSCHEDULEDUPDATEDRIVER_H +#define SUSCHEDULEDUPDATEDRIVER_H + +#import +#import "SUUIBasedUpdateDriver.h" + +@interface SUScheduledUpdateDriver : SUUIBasedUpdateDriver + +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUScheduledUpdateDriver.m b/Frameworks/Sparkle/Sparkle/SUScheduledUpdateDriver.m new file mode 100644 index 000000000..b51fd91dc --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUScheduledUpdateDriver.m @@ -0,0 +1,52 @@ +// +// SUScheduledUpdateDriver.m +// Sparkle +// +// Created by Andy Matuschak on 5/6/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUScheduledUpdateDriver.h" +#import "SUUpdater.h" + +#import "SUAppcast.h" +#import "SUAppcastItem.h" +#import "SUVersionComparisonProtocol.h" + +@interface SUScheduledUpdateDriver () + +@property (assign) BOOL showErrors; + +@end + +@implementation SUScheduledUpdateDriver + +@synthesize showErrors; + +- (void)didFindValidUpdate +{ + self.showErrors = YES; // We only start showing errors after we present the UI for the first time. + [super didFindValidUpdate]; +} + +- (void)didNotFindUpdate +{ + id updaterDelegate = [self.updater delegate]; + + if ([updaterDelegate respondsToSelector:@selector(updaterDidNotFindUpdate:)]) { + [updaterDelegate updaterDidNotFindUpdate:self.updater]; + } + [[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterDidNotFindUpdateNotification object:self.updater]; + + [self abortUpdate]; // Don't tell the user that no update was found; this was a scheduled update. +} + +- (void)abortUpdateWithError:(NSError *)error +{ + if (self.showErrors) + [super abortUpdateWithError:error]; + else + [self abortUpdate]; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUStandardVersionComparator.h b/Frameworks/Sparkle/Sparkle/SUStandardVersionComparator.h new file mode 100644 index 000000000..f40d5715b --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUStandardVersionComparator.h @@ -0,0 +1,37 @@ +// +// SUStandardVersionComparator.h +// Sparkle +// +// Created by Andy Matuschak on 12/21/07. +// Copyright 2007 Andy Matuschak. All rights reserved. +// + +#ifndef SUSTANDARDVERSIONCOMPARATOR_H +#define SUSTANDARDVERSIONCOMPARATOR_H + + +#import "SUVersionComparisonProtocol.h" + +/*! + Sparkle's default version comparator. + + This comparator is adapted from MacPAD, by Kevin Ballard. + It's "dumb" in that it does essentially string comparison, + in components split by character type. +*/ +@interface SUStandardVersionComparator : NSObject + +/*! + Returns a singleton instance of the comparator. +*/ ++ (SUStandardVersionComparator *)defaultComparator; + +/*! + Compares version strings through textual analysis. + + See the implementation for more details. +*/ +- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUStandardVersionComparator.m b/Frameworks/Sparkle/Sparkle/SUStandardVersionComparator.m new file mode 100644 index 000000000..b7c876a50 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUStandardVersionComparator.m @@ -0,0 +1,170 @@ +// +// SUStandardVersionComparator.m +// Sparkle +// +// Created by Andy Matuschak on 12/21/07. +// Copyright 2007 Andy Matuschak. All rights reserved. +// + +#import "SUUpdater.h" + +#import "SUAppcast.h" +#import "SUAppcastItem.h" +#import "SUVersionComparisonProtocol.h" +#import "SUStandardVersionComparator.h" + +@implementation SUStandardVersionComparator + ++ (SUStandardVersionComparator *)defaultComparator +{ + static SUStandardVersionComparator *defaultComparator = nil; + if (defaultComparator == nil) { + defaultComparator = [[SUStandardVersionComparator alloc] init]; + } + return defaultComparator; +} + +typedef NS_ENUM(NSInteger, SUCharacterType) { + kNumberType, + kStringType, + kSeparatorType, +}; + +- (SUCharacterType)typeOfCharacter:(NSString *)character +{ + if ([character isEqualToString:@"."]) { + return kSeparatorType; + } else if ([[NSCharacterSet decimalDigitCharacterSet] characterIsMember:[character characterAtIndex:0]]) { + return kNumberType; + } else if ([[NSCharacterSet whitespaceAndNewlineCharacterSet] characterIsMember:[character characterAtIndex:0]]) { + return kSeparatorType; + } else if ([[NSCharacterSet punctuationCharacterSet] characterIsMember:[character characterAtIndex:0]]) { + return kSeparatorType; + } else { + return kStringType; + } +} + +- (NSArray *)splitVersionString:(NSString *)version +{ + NSString *character; + NSMutableString *s; + NSUInteger i, n; + SUCharacterType oldType, newType; + NSMutableArray *parts = [NSMutableArray array]; + if ([version length] == 0) { + // Nothing to do here + return parts; + } + s = [[version substringToIndex:1] mutableCopy]; + oldType = [self typeOfCharacter:s]; + n = [version length] - 1; + for (i = 1; i <= n; ++i) { + character = [version substringWithRange:NSMakeRange(i, 1)]; + newType = [self typeOfCharacter:character]; + if (oldType != newType || oldType == kSeparatorType) { + // We've reached a new segment + NSString *aPart = [[NSString alloc] initWithString:s]; + [parts addObject:aPart]; + [s setString:character]; + } else { + // Add character to string and continue + [s appendString:character]; + } + oldType = newType; + } + + // Add the last part onto the array + [parts addObject:[NSString stringWithString:s]]; + return parts; +} + +- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB +{ + NSArray *partsA = [self splitVersionString:versionA]; + NSArray *partsB = [self splitVersionString:versionB]; + + NSString *partA, *partB; + NSUInteger i, n; + long long valueA, valueB; + SUCharacterType typeA, typeB; + + n = MIN([partsA count], [partsB count]); + for (i = 0; i < n; ++i) { + partA = partsA[i]; + partB = partsB[i]; + + typeA = [self typeOfCharacter:partA]; + typeB = [self typeOfCharacter:partB]; + + // Compare types + if (typeA == typeB) { + // Same type; we can compare + if (typeA == kNumberType) { + valueA = [partA longLongValue]; + valueB = [partB longLongValue]; + if (valueA > valueB) { + return NSOrderedDescending; + } else if (valueA < valueB) { + return NSOrderedAscending; + } + } else if (typeA == kStringType) { + NSComparisonResult result = [partA compare:partB]; + if (result != NSOrderedSame) { + return result; + } + } + } else { + // Not the same type? Now we have to do some validity checking + if (typeA != kStringType && typeB == kStringType) { + // typeA wins + return NSOrderedDescending; + } else if (typeA == kStringType && typeB != kStringType) { + // typeB wins + return NSOrderedAscending; + } else { + // One is a number and the other is a period. The period is invalid + if (typeA == kNumberType) { + return NSOrderedDescending; + } else { + return NSOrderedAscending; + } + } + } + } + // The versions are equal up to the point where they both still have parts + // Lets check to see if one is larger than the other + if ([partsA count] != [partsB count]) { + // Yep. Lets get the next part of the larger + // n holds the index of the part we want. + NSString *missingPart; + SUCharacterType missingType; + NSComparisonResult shorterResult, largerResult; + + if ([partsA count] > [partsB count]) { + missingPart = partsA[n]; + shorterResult = NSOrderedAscending; + largerResult = NSOrderedDescending; + } else { + missingPart = partsB[n]; + shorterResult = NSOrderedDescending; + largerResult = NSOrderedAscending; + } + + missingType = [self typeOfCharacter:missingPart]; + // Check the type + if (missingType == kStringType) { + // It's a string. Shorter version wins + return shorterResult; + } else { + // It's a number/period. Larger version wins + return largerResult; + } + } + + // The 2 strings are identical + return NSOrderedSame; +} + + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUStatus.xib b/Frameworks/Sparkle/Sparkle/SUStatus.xib new file mode 100644 index 000000000..fca3d15d3 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUStatus.xib @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSIsNil + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/SUStatusController.h b/Frameworks/Sparkle/Sparkle/SUStatusController.h new file mode 100644 index 000000000..8a2792589 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUStatusController.h @@ -0,0 +1,35 @@ +// +// SUStatusController.h +// Sparkle +// +// Created by Andy Matuschak on 3/14/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUSTATUSCONTROLLER_H +#define SUSTATUSCONTROLLER_H + +#import "SUWindowController.h" + +@class SUHost; +@interface SUStatusController : SUWindowController +@property (weak) IBOutlet NSButton *actionButton; +@property (weak) IBOutlet NSProgressIndicator *progressBar; + +@property (copy) NSString *statusText; +@property double progressValue; +@property (nonatomic) double maxProgressValue; +@property (getter=isButtonEnabled) BOOL buttonEnabled; + +- (instancetype)initWithHost:(SUHost *)host; + +// Pass 0 for the max progress value to get an indeterminate progress bar. +// Pass nil for the status text to not show it. +- (void)beginActionWithTitle:(NSString *)title maxProgressValue:(double)maxProgressValue statusText:(NSString *)statusText; + +// If isDefault is YES, the button's key equivalent will be \r. +- (void)setButtonTitle:(NSString *)buttonTitle target:(id)target action:(SEL)action isDefault:(BOOL)isDefault; + +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUStatusController.m b/Frameworks/Sparkle/Sparkle/SUStatusController.m new file mode 100644 index 000000000..b1ca3b039 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUStatusController.m @@ -0,0 +1,120 @@ +// +// SUStatusController.m +// Sparkle +// +// Created by Andy Matuschak on 3/14/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#import "SUUpdater.h" + +#import "SUAppcast.h" +#import "SUAppcastItem.h" +#import "SUVersionComparisonProtocol.h" +#import "SUStatusController.h" +#import "SUHost.h" + +@interface SUStatusController () +@property (copy) NSString *title, *buttonTitle; +@property (strong) SUHost *host; +@end + +@implementation SUStatusController +@synthesize progressValue; +@synthesize maxProgressValue; +@synthesize statusText; +@synthesize title; +@synthesize buttonTitle; +@synthesize host; +@synthesize actionButton; +@synthesize progressBar; + +- (instancetype)initWithHost:(SUHost *)aHost +{ + self = [super initWithHost:aHost windowNibName:@"SUStatus"]; + if (self) + { + self.host = aHost; + [self setShouldCascadeWindows:NO]; + } + return self; +} + +- (NSString *)description { return [NSString stringWithFormat:@"%@ <%@, %@>", [self class], [self.host bundlePath], [self.host installationPath]]; } + +- (void)awakeFromNib +{ + if ([self.host isBackgroundApplication]) { + [[self window] setLevel:NSFloatingWindowLevel]; + } + + [[self window] center]; + [[self window] setFrameAutosaveName:@"SUStatusFrame"]; + [self.progressBar setUsesThreadedAnimation:YES]; +} + +- (NSString *)windowTitle +{ + return [NSString stringWithFormat:SULocalizedString(@"Updating %@", nil), [self.host name]]; +} + +- (NSImage *)applicationIcon +{ + return [self.host icon]; +} + +- (void)beginActionWithTitle:(NSString *)aTitle maxProgressValue:(double)aMaxProgressValue statusText:(NSString *)aStatusText +{ + self.title = aTitle; + + self.maxProgressValue = aMaxProgressValue; + self.statusText = aStatusText; +} + +- (void)setButtonTitle:(NSString *)aButtonTitle target:(id)target action:(SEL)action isDefault:(BOOL)isDefault +{ + self.buttonTitle = aButtonTitle; + + [self window]; + [self.actionButton sizeToFit]; + // Except we're going to add 15 px for padding. + [self.actionButton setFrameSize:NSMakeSize([self.actionButton frame].size.width + 15, [self.actionButton frame].size.height)]; + // Now we have to move it over so that it's always 15px from the side of the window. + [self.actionButton setFrameOrigin:NSMakePoint([[self window] frame].size.width - 15 - [self.actionButton frame].size.width, [self.actionButton frame].origin.y)]; + // Redisplay superview to clean up artifacts + [[self.actionButton superview] display]; + + [self.actionButton setTarget:target]; + [self.actionButton setAction:action]; + [self.actionButton setKeyEquivalent:isDefault ? @"\r" : @""]; + + // 06/05/2008 Alex: Avoid a crash when cancelling during the extraction + [self setButtonEnabled:(target != nil)]; +} + +- (BOOL)progressBarShouldAnimate +{ + return YES; +} + +- (void)setButtonEnabled:(BOOL)enabled +{ + [self.actionButton setEnabled:enabled]; +} + +- (BOOL)isButtonEnabled +{ + return [self.actionButton isEnabled]; +} + +- (void)setMaxProgressValue:(double)value +{ + if (value < 0.0) value = 0.0; + maxProgressValue = value; + [self setProgressValue:0.0]; + [self.progressBar setIndeterminate:(value == 0.0)]; + [self.progressBar startAnimation:self]; + [self.progressBar setUsesThreadedAnimation:YES]; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUSystemProfiler.h b/Frameworks/Sparkle/Sparkle/SUSystemProfiler.h new file mode 100644 index 000000000..124f66916 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUSystemProfiler.h @@ -0,0 +1,20 @@ +// +// SUSystemProfiler.h +// Sparkle +// +// Created by Andy Matuschak on 12/22/07. +// Copyright 2007 Andy Matuschak. All rights reserved. +// + +#ifndef SUSYSTEMPROFILER_H +#define SUSYSTEMPROFILER_H + +#import + +@class SUHost; +@interface SUSystemProfiler : NSObject ++ (SUSystemProfiler *)sharedSystemProfiler; +- (NSMutableArray *)systemProfileArrayForHost:(SUHost *)host; +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUSystemProfiler.m b/Frameworks/Sparkle/Sparkle/SUSystemProfiler.m new file mode 100644 index 000000000..767438d0c --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUSystemProfiler.m @@ -0,0 +1,156 @@ +// +// SUSystemProfiler.m +// Sparkle +// +// Created by Andy Matuschak on 12/22/07. +// Copyright 2007 Andy Matuschak. All rights reserved. +// Adapted from Sparkle+, by Tom Harrington. +// + +#import "SUSystemProfiler.h" + +#import "SUHost.h" +#include + +@implementation SUSystemProfiler ++ (SUSystemProfiler *)sharedSystemProfiler +{ + static SUSystemProfiler *sharedSystemProfiler = nil; + if (!sharedSystemProfiler) { + sharedSystemProfiler = [[self alloc] init]; + } + return sharedSystemProfiler; +} + +- (NSDictionary *)modelTranslationTable +{ + NSString *path = [[NSBundle bundleForClass:[self class]] pathForResource:@"SUModelTranslation" ofType:@"plist"]; + return [[NSDictionary alloc] initWithContentsOfFile:path]; +} + +- (NSMutableArray *)systemProfileArrayForHost:(SUHost *)host +{ + NSDictionary *modelTranslation = [self modelTranslationTable]; + + // Gather profile information and append it to the URL. + NSMutableArray *profileArray = [NSMutableArray array]; + NSArray *profileDictKeys = @[@"key", @"displayKey", @"value", @"displayValue"]; + int error = 0; + int value = 0; + size_t length = sizeof(value); + + // OS version + NSString *currentSystemVersion = [SUHost systemVersionString]; + if (currentSystemVersion != nil) { + [profileArray addObject:[NSDictionary dictionaryWithObjects:@[@"osVersion", @"OS Version", currentSystemVersion, currentSystemVersion] forKeys:profileDictKeys]]; + } + + // CPU type (decoder info for values found here is in mach/machine.h) + error = sysctlbyname("hw.cputype", &value, &length, NULL, 0); + int cpuType = -1; + if (error == 0) { + cpuType = value; + NSString *visibleCPUType; + switch (value) { + case CPU_TYPE_X86: visibleCPUType = @"Intel"; break; + case CPU_TYPE_POWERPC: visibleCPUType = @"PowerPC"; break; + default: visibleCPUType = @"Unknown"; break; + } + [profileArray addObject:[NSDictionary dictionaryWithObjects:@[@"cputype", @"CPU Type", @(value), visibleCPUType] forKeys:profileDictKeys]]; + } + error = sysctlbyname("hw.cpu64bit_capable", &value, &length, NULL, 0); + if (error != 0) { + error = sysctlbyname("hw.optional.x86_64", &value, &length, NULL, 0); //x86 specific + } + if (error != 0) { + error = sysctlbyname("hw.optional.64bitops", &value, &length, NULL, 0); //PPC specific + } + + BOOL is64bit = NO; + + if (error == 0) { + is64bit = value == 1; + [profileArray addObject:[NSDictionary dictionaryWithObjects:@[@"cpu64bit", @"CPU is 64-Bit?", @(is64bit), is64bit ? @"Yes" : @"No"] forKeys:profileDictKeys]]; + } + error = sysctlbyname("hw.cpusubtype", &value, &length, NULL, 0); + if (error == 0) { + NSString *visibleCPUSubType; + if (cpuType == 7) { + // Intel + // TODO: other Intel processors, like Core i7, i5, i3, Xeon? + visibleCPUSubType = is64bit ? @"Intel Core 2" : @"Intel Core"; // If anyone knows how to tell a Core Duo from a Core Solo, please email tph@atomicbird.com + } else if (cpuType == 18) { + // PowerPC + switch (value) { + case 9: visibleCPUSubType=@"G3"; break; + case 10: case 11: visibleCPUSubType=@"G4"; break; + case 100: visibleCPUSubType=@"G5"; break; + default: visibleCPUSubType=@"Other"; break; + } + } else { + visibleCPUSubType = @"Other"; + } + [profileArray addObject:[NSDictionary dictionaryWithObjects:@[@"cpusubtype", @"CPU Subtype", @(value), visibleCPUSubType] forKeys:profileDictKeys]]; + } + error = sysctlbyname("hw.model", NULL, &length, NULL, 0); + if (error == 0) { + char *cpuModel = (char *)malloc(sizeof(char) * length); + if (cpuModel != NULL) { + error = sysctlbyname("hw.model", cpuModel, &length, NULL, 0); + if (error == 0) { + NSString *rawModelName = @(cpuModel); + NSString *visibleModelName = modelTranslation[rawModelName]; + if (visibleModelName == nil) { + visibleModelName = rawModelName; + } + [profileArray addObject:[NSDictionary dictionaryWithObjects:@[@"model", @"Mac Model", rawModelName, visibleModelName] forKeys:profileDictKeys]]; + } + free(cpuModel); + } + } + + // Number of CPUs + error = sysctlbyname("hw.ncpu", &value, &length, NULL, 0); + if (error == 0) { + [profileArray addObject:[NSDictionary dictionaryWithObjects:@[@"ncpu", @"Number of CPUs", @(value), @(value)] forKeys:profileDictKeys]]; + } + + // User preferred language + NSUserDefaults *defs = [NSUserDefaults standardUserDefaults]; + NSArray *languages = [defs objectForKey:@"AppleLanguages"]; + if ([languages count] > 0) { + [profileArray addObject:[NSDictionary dictionaryWithObjects:@[@"lang", @"Preferred Language", languages[0], languages[0]] forKeys:profileDictKeys]]; + } + + // Application sending the request + NSString *appName = [host name]; + if (appName) { + [profileArray addObject:[NSDictionary dictionaryWithObjects:@[@"appName", @"Application Name", appName, appName] forKeys:profileDictKeys]]; + } + NSString *appVersion = [host version]; + if (appVersion) { + [profileArray addObject:[NSDictionary dictionaryWithObjects:@[@"appVersion", @"Application Version", appVersion, appVersion] forKeys:profileDictKeys]]; + } + + // Number of displays? + + // CPU speed + unsigned long hz; + size_t hz_size = sizeof(unsigned long); + if (sysctlbyname("hw.cpufrequency", &hz, &hz_size, NULL, 0) == 0) { + unsigned long mhz = hz / 1000000; + [profileArray addObject:[NSDictionary dictionaryWithObjects:@[@"cpuFreqMHz", @"CPU Speed (GHz)", @(mhz), @(mhz / 1000.)] forKeys:profileDictKeys]]; + } + + // amount of RAM + unsigned long bytes; + size_t bytes_size = sizeof(unsigned long); + if (sysctlbyname("hw.memsize", &bytes, &bytes_size, NULL, 0) == 0) { + double megabytes = bytes / (1024. * 1024.); + [profileArray addObject:[NSDictionary dictionaryWithObjects:@[@"ramMB", @"Memory (MB)", @(megabytes), @(megabytes)] forKeys:profileDictKeys]]; + } + + return profileArray; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUUIBasedUpdateDriver.h b/Frameworks/Sparkle/Sparkle/SUUIBasedUpdateDriver.h new file mode 100644 index 000000000..fb1450724 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUIBasedUpdateDriver.h @@ -0,0 +1,26 @@ +// +// SUUIBasedUpdateDriver.h +// Sparkle +// +// Created by Andy Matuschak on 5/5/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUUIBASEDUPDATEDRIVER_H +#define SUUIBASEDUPDATEDRIVER_H + +#import +#import "SUBasicUpdateDriver.h" +#import "SUUpdateAlert.h" + +@class SUStatusController; + +@interface SUUIBasedUpdateDriver : SUBasicUpdateDriver + +- (void)showModalAlert:(NSAlert *)alert; +- (IBAction)cancelDownload:(id)sender; +- (void)installAndRestart:(id)sender; + +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUUIBasedUpdateDriver.m b/Frameworks/Sparkle/Sparkle/SUUIBasedUpdateDriver.m new file mode 100644 index 000000000..73237322d --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUIBasedUpdateDriver.m @@ -0,0 +1,240 @@ +// +// SUUIBasedUpdateDriver.m +// Sparkle +// +// Created by Andy Matuschak on 5/5/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUUIBasedUpdateDriver.h" + +#import "SUUpdateAlert.h" +#import "SUUpdater_Private.h" +#import "SUHost.h" +#import "SUStatusController.h" +#import "SUConstants.h" + +@interface SUUIBasedUpdateDriver () + +@property (strong) SUStatusController *statusController; +@property (strong) SUUpdateAlert *updateAlert; + +@end + +@implementation SUUIBasedUpdateDriver + +@synthesize statusController; +@synthesize updateAlert; + +- (void)didFindValidUpdate +{ + self.updateAlert = [[SUUpdateAlert alloc] initWithAppcastItem:self.updateItem host:self.host]; + [self.updateAlert setDelegate:self]; + + id versDisp = nil; + if ([[self.updater delegate] respondsToSelector:@selector(versionDisplayerForUpdater:)]) { + versDisp = [[self.updater delegate] versionDisplayerForUpdater:self.updater]; + } + [self.updateAlert setVersionDisplayer:versDisp]; + + if ([[self.updater delegate] respondsToSelector:@selector(updater:didFindValidUpdate:)]) { + [[self.updater delegate] updater:self.updater didFindValidUpdate:self.updateItem]; + } + + // If the app is a menubar app or the like, we need to focus it first and alter the + // update prompt to behave like a normal window. Otherwise if the window were hidden + // there may be no way for the application to be activated to make it visible again. + if ([self.host isBackgroundApplication]) + { + [[self.updateAlert window] setHidesOnDeactivate:NO]; + [NSApp activateIgnoringOtherApps:YES]; + } + + // Only show the update alert if the app is active; otherwise, we'll wait until it is. + if ([NSApp isActive]) + [[self.updateAlert window] makeKeyAndOrderFront:self]; + else + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive:) name:NSApplicationDidBecomeActiveNotification object:NSApp]; +} + +- (void)didNotFindUpdate +{ + if ([[self.updater delegate] respondsToSelector:@selector(updaterDidNotFindUpdate:)]) + [[self.updater delegate] updaterDidNotFindUpdate:self.updater]; + [[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterDidNotFindUpdateNotification object:self.updater]; + + NSAlert *alert = [NSAlert alertWithMessageText:SULocalizedString(@"You're up-to-date!", "Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates.") + defaultButton:SULocalizedString(@"OK", nil) + alternateButton:nil + otherButton:nil + informativeTextWithFormat:SULocalizedString(@"%@ %@ is currently the newest version available.", nil), [self.host name], [self.host displayVersion]]; + [self showModalAlert:alert]; + [self abortUpdate]; +} + +- (void)applicationDidBecomeActive:(NSNotification *)__unused aNotification +{ + [[self.updateAlert window] makeKeyAndOrderFront:self]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:@"NSApplicationDidBecomeActiveNotification" object:NSApp]; +} + +- (void)updateAlert:(SUUpdateAlert *)__unused alert finishedWithChoice:(SUUpdateAlertChoice)choice +{ + self.updateAlert = nil; + [self.host setObject:nil forUserDefaultsKey:SUSkippedVersionKey]; + switch (choice) + { + case SUInstallUpdateChoice: + self.statusController = [[SUStatusController alloc] initWithHost:self.host]; + [self.statusController beginActionWithTitle:SULocalizedString(@"Downloading update...", @"Take care not to overflow the status window.") maxProgressValue:0.0 statusText:nil]; + [self.statusController setButtonTitle:SULocalizedString(@"Cancel", nil) target:self action:@selector(cancelDownload:) isDefault:NO]; + [self.statusController showWindow:self]; + [self downloadUpdate]; + break; + + case SUOpenInfoURLChoice: + [[NSWorkspace sharedWorkspace] openURL:[self.updateItem infoURL]]; + [self abortUpdate]; + break; + + case SUSkipThisVersionChoice: + [self.host setObject:[self.updateItem versionString] forUserDefaultsKey:SUSkippedVersionKey]; + [self abortUpdate]; + break; + + case SURemindMeLaterChoice: + [self abortUpdate]; + break; + } +} + +- (void)download:(NSURLDownload *)__unused download didReceiveResponse:(NSURLResponse *)response +{ + [self.statusController setMaxProgressValue:[response expectedContentLength]]; +} + +- (NSString *)humanReadableSizeFromDouble:(double)value +{ + if (value < 1000) { + return [NSString stringWithFormat:@"%.0lf %@", value, SULocalizedString(@"B", @"the unit for bytes")]; + } + + if (value < 1000 * 1000) { + return [NSString stringWithFormat:@"%.0lf %@", value / 1000.0, SULocalizedString(@"KB", @"the unit for kilobytes")]; + } + + if (value < 1000 * 1000 * 1000) { + return [NSString stringWithFormat:@"%.1lf %@", value / 1000.0 / 1000.0, SULocalizedString(@"MB", @"the unit for megabytes")]; + } + + return [NSString stringWithFormat:@"%.2lf %@", value / 1000.0 / 1000.0 / 1000.0, SULocalizedString(@"GB", @"the unit for gigabytes")]; +} + +- (void)download:(NSURLDownload *)__unused download didReceiveDataOfLength:(NSUInteger)length +{ + [self.statusController setProgressValue:[self.statusController progressValue] + (double)length]; + if ([self.statusController maxProgressValue] > 0.0) + [self.statusController setStatusText:[NSString stringWithFormat:SULocalizedString(@"%@ of %@", nil), [self humanReadableSizeFromDouble:[self.statusController progressValue]], [self humanReadableSizeFromDouble:[self.statusController maxProgressValue]]]]; + else + [self.statusController setStatusText:[NSString stringWithFormat:SULocalizedString(@"%@ downloaded", nil), [self humanReadableSizeFromDouble:[self.statusController progressValue]]]]; +} + +- (IBAction)cancelDownload:(id)__unused sender +{ + if (self.download) + [self.download cancel]; + [self abortUpdate]; +} + +- (void)extractUpdate +{ + // Now we have to extract the downloaded archive. + [self.statusController beginActionWithTitle:SULocalizedString(@"Extracting update...", @"Take care not to overflow the status window.") maxProgressValue:0.0 statusText:nil]; + [self.statusController setButtonEnabled:NO]; + [super extractUpdate]; +} + +- (void)unarchiver:(SUUnarchiver *)__unused ua extractedLength:(unsigned long)length +{ + // We do this here instead of in extractUpdate so that we only have a determinate progress bar for archives with progress. + if ([self.statusController maxProgressValue] == 0.0) + { + NSDictionary *attributes; + attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:self.downloadPath error:nil]; + [self.statusController setMaxProgressValue:[attributes[NSFileSize] doubleValue]]; + } + [self.statusController setProgressValue:[self.statusController progressValue] + (double)length]; +} + +- (void)unarchiverDidFinish:(SUUnarchiver *)__unused ua +{ + [self.statusController beginActionWithTitle:SULocalizedString(@"Ready to Install", nil) maxProgressValue:1.0 statusText:nil]; + [self.statusController setProgressValue:1.0]; // Fill the bar. + [self.statusController setButtonEnabled:YES]; + [self.statusController setButtonTitle:SULocalizedString(@"Install and Relaunch", nil) target:self action:@selector(installAndRestart:) isDefault:YES]; + [[self.statusController window] makeKeyAndOrderFront:self]; + [NSApp requestUserAttention:NSInformationalRequest]; +} + +- (void)installAndRestart:(id)__unused sender +{ + [self installWithToolAndRelaunch:YES]; +} + +- (void)installWithToolAndRelaunch:(BOOL)relaunch +{ + [self.statusController beginActionWithTitle:SULocalizedString(@"Installing update...", @"Take care not to overflow the status window.") maxProgressValue:0.0 statusText:nil]; + [self.statusController setButtonEnabled:NO]; + [super installWithToolAndRelaunch:relaunch]; +} + +- (void)terminateApp +{ + // if a user chooses to NOT relaunch the app (as is the case with WebKit + // when it asks you if you are sure you want to close the app with multiple + // tabs open), the status window still stays on the screen and obscures + // other windows; with this fix, it doesn't + + if (self.statusController) { + [self.statusController close]; + self.statusController = nil; + } + + [super terminateApp]; +} + +- (void)abortUpdateWithError:(NSError *)error +{ + NSAlert *alert = [NSAlert alertWithMessageText:SULocalizedString(@"Update Error!", nil) defaultButton:SULocalizedString(@"Cancel Update", nil) alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", [error localizedDescription]]; + [self showModalAlert:alert]; + [super abortUpdateWithError:error]; +} + +- (void)abortUpdate +{ + if (self.statusController) + { + [self.statusController close]; + self.statusController = nil; + } + [super abortUpdate]; +} + +- (void)showModalAlert:(NSAlert *)alert +{ + if ([[self.updater delegate] respondsToSelector:@selector(updaterWillShowModalAlert:)]) { + [[self.updater delegate] updaterWillShowModalAlert:self.updater]; + } + + // When showing a modal alert we need to ensure that background applications + // are focused to inform the user since there is no dock icon to notify them. + if ([self.host isBackgroundApplication]) { [NSApp activateIgnoringOtherApps:YES]; } + + [alert setIcon:[self.host icon]]; + [alert runModal]; + + if ([[self.updater delegate] respondsToSelector:@selector(updaterDidShowModalAlert:)]) + [[self.updater delegate] updaterDidShowModalAlert:self.updater]; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUUnarchiver.h b/Frameworks/Sparkle/Sparkle/SUUnarchiver.h new file mode 100644 index 000000000..523bdf257 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUnarchiver.h @@ -0,0 +1,33 @@ +// +// SUUnarchiver.h +// Sparkle +// +// Created by Andy Matuschak on 3/16/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUUNARCHIVER_H +#define SUUNARCHIVER_H + +@class SUHost; +@protocol SUUnarchiverDelegate; + +@interface SUUnarchiver : NSObject + +@property (copy, readonly) NSString *archivePath; +@property (weak, readonly) SUHost *updateHost; +@property (weak) id delegate; + ++ (SUUnarchiver *)unarchiverForPath:(NSString *)path updatingHost:(SUHost *)host; + +- (void)start; +@end + +@protocol SUUnarchiverDelegate +- (void)unarchiverDidFinish:(SUUnarchiver *)unarchiver; +- (void)unarchiverDidFail:(SUUnarchiver *)unarchiver; +@optional +- (void)unarchiver:(SUUnarchiver *)unarchiver extractedLength:(unsigned long)length; +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUUnarchiver.m b/Frameworks/Sparkle/Sparkle/SUUnarchiver.m new file mode 100644 index 000000000..99f777592 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUnarchiver.m @@ -0,0 +1,93 @@ +// +// SUUnarchiver.m +// Sparkle +// +// Created by Andy Matuschak on 3/16/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + + +#import "SUUpdater.h" + +#import "SUAppcast.h" +#import "SUAppcastItem.h" +#import "SUVersionComparisonProtocol.h" +#import "SUUnarchiver.h" +#import "SUUnarchiver_Private.h" + +@implementation SUUnarchiver + +@synthesize archivePath; +@synthesize updateHost; +@synthesize delegate; + ++ (SUUnarchiver *)unarchiverForPath:(NSString *)path updatingHost:(SUHost *)host +{ + for (id current in [self unarchiverImplementations]) + { + if ([current canUnarchivePath:path]) { + return [[current alloc] initWithPath:path host:host]; + } + } + return nil; +} + +- (NSString *)description { return [NSString stringWithFormat:@"%@ <%@>", [self class], self.archivePath]; } + +- (void)start +{ + // No-op +} + +- (instancetype)initWithPath:(NSString *)path host:(SUHost *)host +{ + if ((self = [super init])) + { + archivePath = [path copy]; + updateHost = host; + } + return self; +} + ++ (BOOL)canUnarchivePath:(NSString *)__unused path +{ + return NO; +} + +- (void)notifyDelegateOfExtractedLength:(size_t)length +{ + if ([self.delegate respondsToSelector:@selector(unarchiver:extractedLength:)]) { + [self.delegate unarchiver:self extractedLength:length]; + } +} + +- (void)notifyDelegateOfSuccess +{ + if ([self.delegate respondsToSelector:@selector(unarchiverDidFinish:)]) { + [self.delegate unarchiverDidFinish:self]; + } +} + +- (void)notifyDelegateOfFailure +{ + if ([self.delegate respondsToSelector:@selector(unarchiverDidFail:)]) { + [self.delegate unarchiverDidFail:self]; + } +} + +static NSMutableArray *gUnarchiverImplementations; + ++ (void)registerImplementation:(Class)implementation +{ + if (!gUnarchiverImplementations) { + gUnarchiverImplementations = [[NSMutableArray alloc] init]; + } + [gUnarchiverImplementations addObject:implementation]; +} + ++ (NSArray *)unarchiverImplementations +{ + return [NSArray arrayWithArray:gUnarchiverImplementations]; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUUnarchiver_Private.h b/Frameworks/Sparkle/Sparkle/SUUnarchiver_Private.h new file mode 100644 index 000000000..e2d66bd08 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUnarchiver_Private.h @@ -0,0 +1,26 @@ +// +// SUUnarchiver_Private.h +// Sparkle +// +// Created by Andy Matuschak on 6/17/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUUNARCHIVER_PRIVATE_H +#define SUUNARCHIVER_PRIVATE_H + +#import +#import "SUUnarchiver.h" + +@interface SUUnarchiver (Private) ++ (void)registerImplementation:(Class)implementation; ++ (NSArray *)unarchiverImplementations; ++ (BOOL)canUnarchivePath:(NSString *)path; +- (instancetype)initWithPath:(NSString *)path host:(SUHost *)host; + +- (void)notifyDelegateOfExtractedLength:(size_t)length; +- (void)notifyDelegateOfSuccess; +- (void)notifyDelegateOfFailure; +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUUpdateAlert.h b/Frameworks/Sparkle/Sparkle/SUUpdateAlert.h new file mode 100644 index 000000000..caf9ccba9 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUpdateAlert.h @@ -0,0 +1,44 @@ +// +// SUUpdateAlert.h +// Sparkle +// +// Created by Andy Matuschak on 3/12/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUUPDATEALERT_H +#define SUUPDATEALERT_H + +#import "SUWindowController.h" +#import "SUVersionDisplayProtocol.h" + +@protocol SUUpdateAlertDelegate; + +typedef NS_ENUM(NSInteger, SUUpdateAlertChoice) { + SUInstallUpdateChoice, + SURemindMeLaterChoice, + SUSkipThisVersionChoice, + SUOpenInfoURLChoice +}; + +@class WebView, SUAppcastItem, SUHost; +@interface SUUpdateAlert : SUWindowController + +@property (weak) id delegate; +@property (weak) id versionDisplayer; + +- (instancetype)initWithAppcastItem:(SUAppcastItem *)item host:(SUHost *)host; + +- (IBAction)installUpdate:sender; +- (IBAction)skipThisVersion:sender; +- (IBAction)remindMeLater:sender; + +@end + +@protocol SUUpdateAlertDelegate +- (void)updateAlert:(SUUpdateAlert *)updateAlert finishedWithChoice:(SUUpdateAlertChoice)updateChoice; +@optional +- (void)updateAlert:(SUUpdateAlert *)updateAlert shouldAllowAutoUpdate:(BOOL *)shouldAllowAutoUpdate; +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUUpdateAlert.m b/Frameworks/Sparkle/Sparkle/SUUpdateAlert.m new file mode 100644 index 000000000..0eb7e6132 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUpdateAlert.m @@ -0,0 +1,283 @@ +// +// SUUpdateAlert.m +// Sparkle +// +// Created by Andy Matuschak on 3/12/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +// ----------------------------------------------------------------------------- +// Headers: +// ----------------------------------------------------------------------------- + +#import "SUUpdateAlert.h" + +#import "SUHost.h" +#import + +#import "SUConstants.h" + +@interface SUUpdateAlert () + +@property (strong) SUAppcastItem *updateItem; +@property (strong) SUHost *host; + +@property (strong) NSProgressIndicator *releaseNotesSpinner; +@property (assign) BOOL webViewFinishedLoading; + +@property (weak) IBOutlet WebView *releaseNotesView; +@property (weak) IBOutlet NSView *releaseNotesContainerView; +@property (weak) IBOutlet NSTextField *descriptionField; +@property (weak) IBOutlet NSButton *installButton; +@property (weak) IBOutlet NSButton *skipButton; +@property (weak) IBOutlet NSButton *laterButton; + +@end + +@implementation SUUpdateAlert + +@synthesize delegate; +@synthesize versionDisplayer; + +@synthesize updateItem; +@synthesize host; + +@synthesize releaseNotesSpinner; +@synthesize webViewFinishedLoading; + +@synthesize releaseNotesView; +@synthesize releaseNotesContainerView; +@synthesize descriptionField; +@synthesize installButton; +@synthesize skipButton; +@synthesize laterButton; + +- (instancetype)initWithAppcastItem:(SUAppcastItem *)item host:(SUHost *)aHost +{ + self = [super initWithHost:host windowNibName:@"SUUpdateAlert"]; + if (self) + { + host = aHost; + updateItem = item; + [self setShouldCascadeWindows:NO]; + + // Alex: This dummy line makes sure that the binary is linked against WebKit. + // The SUUpdateAlert.xib file contains a WebView and if we don't link against WebKit, + // we will get a runtime crash when decoding the NIB. It is better to get a link error. + [WebView MIMETypesShownAsHTML]; + } + return self; +} + +- (NSString *)description { return [NSString stringWithFormat:@"%@ <%@>", [self class], [self.host bundlePath]]; } + + +- (void)endWithSelection:(SUUpdateAlertChoice)choice +{ + [self.releaseNotesView stopLoading:self]; + [self.releaseNotesView setFrameLoadDelegate:nil]; + [self.releaseNotesView setPolicyDelegate:nil]; + [self.releaseNotesView removeFromSuperview]; // Otherwise it gets sent Esc presses (why?!) and gets very confused. + [self close]; + if ([self.delegate respondsToSelector:@selector(updateAlert:finishedWithChoice:)]) + [self.delegate updateAlert:self finishedWithChoice:choice]; +} + +- (IBAction)installUpdate:(id)__unused sender +{ + [self endWithSelection:SUInstallUpdateChoice]; +} + +- (IBAction)openInfoURL:(id)__unused sender +{ + [self endWithSelection:SUOpenInfoURLChoice]; +} + +- (IBAction)skipThisVersion:(id)__unused sender +{ + [self endWithSelection:SUSkipThisVersionChoice]; +} + +- (IBAction)remindMeLater:(id)__unused sender +{ + [self endWithSelection:SURemindMeLaterChoice]; +} + +- (void)displayReleaseNotes +{ + // Set the default font + [self.releaseNotesView setPreferencesIdentifier:[SPARKLE_BUNDLE bundleIdentifier]]; + WebPreferences *prefs = [self.releaseNotesView preferences]; + NSString *familyName = [[NSFont systemFontOfSize:8] familyName]; + if ([familyName hasPrefix:@"."]) { // 10.9 returns ".Lucida Grande UI", which isn't a valid name for the WebView + familyName = @"Lucida Grande"; + } + [prefs setStandardFontFamily:familyName]; + [prefs setDefaultFontSize:(int)[NSFont systemFontSizeForControlSize:NSSmallControlSize]]; + [prefs setPlugInsEnabled:NO]; + [self.releaseNotesView setFrameLoadDelegate:self]; + [self.releaseNotesView setPolicyDelegate:self]; + + // Stick a nice big spinner in the middle of the web view until the page is loaded. + NSRect frame = [[self.releaseNotesView superview] frame]; + self.releaseNotesSpinner = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(NSMidX(frame) - 16, NSMidY(frame) - 16, 32, 32)]; + [self.releaseNotesSpinner setStyle:NSProgressIndicatorSpinningStyle]; + [self.releaseNotesSpinner startAnimation:self]; + self.webViewFinishedLoading = NO; + [[self.releaseNotesView superview] addSubview:self.releaseNotesSpinner]; + + // If there's a release notes URL, load it; otherwise, just stick the contents of the description into the web view. + if ([self.updateItem releaseNotesURL]) + { + if ([[self.updateItem releaseNotesURL] isFileURL]) + { + [[self.releaseNotesView mainFrame] loadHTMLString:@"Release notes with file:// URLs are not supported for security reasons—Javascript would be able to read files on your file system." baseURL:nil]; + } + else + { + [[self.releaseNotesView mainFrame] loadRequest:[NSURLRequest requestWithURL:[self.updateItem releaseNotesURL] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30]]; + } + } + else + { + [[self.releaseNotesView mainFrame] loadHTMLString:[self.updateItem itemDescription] baseURL:nil]; + } +} + +- (BOOL)showsReleaseNotes +{ + NSNumber *shouldShowReleaseNotes = [self.host objectForInfoDictionaryKey:SUShowReleaseNotesKey]; + if (shouldShowReleaseNotes == nil) + { + // Don't show release notes if RSS item contains no description and no release notes URL: + return (([self.updateItem itemDescription] != nil + && [[[self.updateItem itemDescription] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length] > 0) + || [self.updateItem releaseNotesURL] != nil); + } + else + return [shouldShowReleaseNotes boolValue]; +} + +- (BOOL)allowsAutomaticUpdates +{ + BOOL allowAutoUpdates = YES; // Defaults to YES. + if ([self.host objectForInfoDictionaryKey:SUAllowsAutomaticUpdatesKey]) + allowAutoUpdates = [self.host boolForInfoDictionaryKey:SUAllowsAutomaticUpdatesKey]; + + // Give delegate a chance to modify this choice: + if (self.delegate && [self.delegate respondsToSelector:@selector(updateAlert:shouldAllowAutoUpdate:)]) + [self.delegate updateAlert:self shouldAllowAutoUpdate:&allowAutoUpdates]; + + return allowAutoUpdates; +} + +- (void)awakeFromNib +{ + BOOL showReleaseNotes = [self showsReleaseNotes]; + + [self.window setFrameAutosaveName: showReleaseNotes ? @"SUUpdateAlert" : @"SUUpdateAlertSmall" ]; + + if ([self.host isBackgroundApplication]) { + [self.window setLevel:NSFloatingWindowLevel]; // This means the window will float over all other apps, if our app is switched out ?! + } + + if ([self.updateItem fileURL] == nil) { + [self.installButton setTitle:SULocalizedString(@"Learn More...", @"Alternate title for 'Install Update' button when there's no download in RSS feed.")]; + [self.installButton setAction:@selector(openInfoURL:)]; + } + + if (showReleaseNotes) { + [self displayReleaseNotes]; + } else { + [self.releaseNotesContainerView removeFromSuperview]; + } + + [self.window.contentView setNeedsLayout:YES]; // Prod autolayout to place everything + + [self.window center]; +} + +- (BOOL)windowShouldClose:(NSNotification *) __unused note +{ + [self endWithSelection:SURemindMeLaterChoice]; + return YES; +} + +- (NSImage *)applicationIcon +{ + return [self.host icon]; +} + +- (NSString *)titleText +{ + return [NSString stringWithFormat:SULocalizedString(@"A new version of %@ is available!", nil), [self.host name]]; +} + +- (NSString *)descriptionText +{ + NSString *updateItemVersion = [self.updateItem displayVersionString]; + NSString *hostVersion = [self.host displayVersion]; + // Display more info if the version strings are the same; useful for betas. + if (!self.versionDisplayer && [updateItemVersion isEqualToString:hostVersion] ) + { + updateItemVersion = [updateItemVersion stringByAppendingFormat:@" (%@)", [self.updateItem versionString]]; + hostVersion = [hostVersion stringByAppendingFormat:@" (%@)", [self.host version]]; + } + else { + [self.versionDisplayer formatVersion:&updateItemVersion andVersion:&hostVersion]; + } + return [NSString stringWithFormat:SULocalizedString(@"%@ %@ is now available--you have %@. Would you like to download it now?", nil), [self.host name], updateItemVersion, hostVersion]; +} + +- (void)webView:(WebView *)sender didFinishLoadForFrame:frame +{ + if ([frame parentFrame] == nil) { + self.webViewFinishedLoading = YES; + [self.releaseNotesSpinner setHidden:YES]; + [sender display]; // necessary to prevent weird scroll bar artifacting + } +} + +- (void)webView:(WebView *)__unused sender decidePolicyForNavigationAction:(NSDictionary *)__unused actionInformation request:(NSURLRequest *)request frame:(WebFrame *)__unused frame decisionListener:(id)listener +{ + if (self.webViewFinishedLoading) { + [[NSWorkspace sharedWorkspace] openURL:[request URL]]; + + [listener ignore]; + } + else { + [listener use]; + } +} + +// Clean up the contextual menu. +- (NSArray *)webView:(WebView *)__unused sender contextMenuItemsForElement:(NSDictionary *)__unused element defaultMenuItems:(NSArray *)defaultMenuItems +{ + NSMutableArray *webViewMenuItems = [defaultMenuItems mutableCopy]; + + if (webViewMenuItems) + { + for (NSMenuItem *menuItem in defaultMenuItems) + { + NSInteger tag = [menuItem tag]; + + switch (tag) + { + case WebMenuItemTagOpenLinkInNewWindow: + case WebMenuItemTagDownloadLinkToDisk: + case WebMenuItemTagOpenImageInNewWindow: + case WebMenuItemTagDownloadImageToDisk: + case WebMenuItemTagOpenFrameInNewWindow: + case WebMenuItemTagGoBack: + case WebMenuItemTagGoForward: + case WebMenuItemTagStop: + case WebMenuItemTagReload: + [webViewMenuItems removeObjectIdenticalTo:menuItem]; + } + } + } + + return webViewMenuItems; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUUpdateDriver.h b/Frameworks/Sparkle/Sparkle/SUUpdateDriver.h new file mode 100644 index 000000000..5575994db --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUpdateDriver.h @@ -0,0 +1,30 @@ +// +// SUUpdateDriver.h +// Sparkle +// +// Created by Andy Matuschak on 5/7/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUUPDATEDRIVER_H +#define SUUPDATEDRIVER_H + +#import + +extern NSString *const SUUpdateDriverFinishedNotification; + +@class SUHost, SUUpdater; +@interface SUUpdateDriver : NSObject + +@property (readonly, weak) SUUpdater *updater; +@property (strong) SUHost *host; + +- (instancetype)initWithUpdater:(SUUpdater *)updater; +- (void)checkForUpdatesAtURL:(NSURL *)URL host:(SUHost *)host; +- (void)abortUpdate; +@property (getter=isInterruptible, readonly) BOOL interruptible; +@property (readonly) BOOL finished; + +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUUpdateDriver.m b/Frameworks/Sparkle/Sparkle/SUUpdateDriver.m new file mode 100644 index 000000000..cee31648e --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUpdateDriver.m @@ -0,0 +1,52 @@ +// +// SUUpdateDriver.m +// Sparkle +// +// Created by Andy Matuschak on 5/7/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUUpdateDriver.h" +#import "SUHost.h" + +NSString *const SUUpdateDriverFinishedNotification = @"SUUpdateDriverFinished"; + +@interface SUUpdateDriver () + +@property (weak) SUUpdater *updater; +@property (copy) NSURL *appcastURL; +@property (getter=isInterruptible) BOOL interruptible; + +@end + +@implementation SUUpdateDriver + +@synthesize updater; +@synthesize host; +@synthesize interruptible; +@synthesize finished; +@synthesize appcastURL; + +- (instancetype)initWithUpdater:(SUUpdater *)anUpdater +{ + if ((self = [super init])) { + self.updater = anUpdater; + } + return self; +} + +- (NSString *)description { return [NSString stringWithFormat:@"%@ <%@, %@>", [self class], [self.host bundlePath], [self.host installationPath]]; } + +- (void)checkForUpdatesAtURL:(NSURL *)URL host:(SUHost *)h +{ + self.appcastURL = URL; + self.host = h; +} + +- (void)abortUpdate +{ + [self setValue:@YES forKey:@"finished"]; + [[NSNotificationCenter defaultCenter] postNotificationName:SUUpdateDriverFinishedNotification object:self]; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUUpdatePermissionPrompt.h b/Frameworks/Sparkle/Sparkle/SUUpdatePermissionPrompt.h new file mode 100644 index 000000000..2320df885 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUpdatePermissionPrompt.h @@ -0,0 +1,33 @@ +// +// SUUpdatePermissionPrompt.h +// Sparkle +// +// Created by Andy Matuschak on 1/24/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUUPDATEPERMISSIONPROMPT_H +#define SUUPDATEPERMISSIONPROMPT_H + +#import "SUWindowController.h" + +typedef NS_ENUM(NSInteger, SUPermissionPromptResult) { + SUAutomaticallyCheck, + SUDoNotAutomaticallyCheck +}; + +@protocol SUUpdatePermissionPromptDelegate; + +@class SUHost; +@interface SUUpdatePermissionPrompt : SUWindowController + ++ (void)promptWithHost:(SUHost *)aHost systemProfile:(NSArray *)profile delegate:(id)d; +- (IBAction)toggleMoreInfo:(id)sender; +- (IBAction)finishPrompt:(id)sender; +@end + +@protocol SUUpdatePermissionPromptDelegate +- (void)updatePermissionPromptFinishedWithResult:(SUPermissionPromptResult)result; +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUUpdatePermissionPrompt.m b/Frameworks/Sparkle/Sparkle/SUUpdatePermissionPrompt.m new file mode 100644 index 000000000..6d31cdf69 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUpdatePermissionPrompt.m @@ -0,0 +1,154 @@ +// +// SUUpdatePermissionPrompt.m +// Sparkle +// +// Created by Andy Matuschak on 1/24/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUUpdatePermissionPrompt.h" + +#import "SUHost.h" +#import "SUConstants.h" + +@interface SUUpdatePermissionPrompt () + +@property (assign) BOOL isShowingMoreInfo; +@property (assign) BOOL shouldSendProfile; + +@property (strong) SUHost *host; +@property (strong) NSArray *systemProfileInformationArray; +@property (weak) id delegate; +@property (weak) IBOutlet NSTextField *descriptionTextField; +@property (weak) IBOutlet NSView *moreInfoView; +@property (weak) IBOutlet NSButton *moreInfoButton; +@property (weak) IBOutlet NSTableView *profileTableView; + +@end + +@implementation SUUpdatePermissionPrompt + +@synthesize isShowingMoreInfo = _isShowingMoreInfo; +@synthesize shouldSendProfile = _shouldSendProfile; +@synthesize host; +@synthesize systemProfileInformationArray; +@synthesize delegate; +@synthesize descriptionTextField; +@synthesize moreInfoView; +@synthesize moreInfoButton; +@synthesize profileTableView; + +- (BOOL)shouldAskAboutProfile +{ + return [[self.host objectForInfoDictionaryKey:SUEnableSystemProfilingKey] boolValue]; +} + +- (instancetype)initWithHost:(SUHost *)aHost systemProfile:(NSArray *)profile delegate:(id)d +{ + self = [super initWithHost:aHost windowNibName:@"SUUpdatePermissionPrompt"]; + if (self) + { + host = aHost; + delegate = d; + self.isShowingMoreInfo = NO; + self.shouldSendProfile = [self shouldAskAboutProfile]; + systemProfileInformationArray = profile; + [self setShouldCascadeWindows:NO]; + } + return self; +} + ++ (void)promptWithHost:(SUHost *)aHost systemProfile:(NSArray *)profile delegate:(id)d +{ + // If this is a background application we need to focus it in order to bring the prompt + // to the user's attention. Otherwise the prompt would be hidden behind other applications and + // the user would not know why the application was paused. + if ([aHost isBackgroundApplication]) { [[NSApplication sharedApplication] activateIgnoringOtherApps:YES]; } + + SUUpdatePermissionPrompt *prompt = [[[self class] alloc] initWithHost:aHost systemProfile:profile delegate:d]; + [NSApp runModalForWindow:[prompt window]]; +} + +- (NSString *)description { return [NSString stringWithFormat:@"%@ <%@>", [self class], [self.host bundlePath]]; } + +- (void)awakeFromNib +{ + if (![self shouldAskAboutProfile]) + { + NSRect frame = [[self window] frame]; + frame.size.height -= [self.moreInfoButton frame].size.height; + [[self window] setFrame:frame display:YES]; + } else { + // Set the table view's delegate so we can disable row selection. + [self.profileTableView setDelegate:(id)self]; + } +} + +- (BOOL)tableView:(NSTableView *) __unused tableView shouldSelectRow:(NSInteger) __unused row { return NO; } + + +- (NSImage *)icon +{ + return [self.host icon]; +} + +- (NSString *)promptDescription +{ + return [NSString stringWithFormat:SULocalizedString(@"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu.", nil), [self.host name]]; +} + +- (IBAction)toggleMoreInfo:(id)__unused sender +{ + self.isShowingMoreInfo = !self.isShowingMoreInfo; + + NSView *contentView = [[self window] contentView]; + NSRect contentViewFrame = [contentView frame]; + NSRect windowFrame = [[self window] frame]; + + NSRect profileMoreInfoViewFrame = [self.moreInfoView frame]; + NSRect profileMoreInfoButtonFrame = [self.moreInfoButton frame]; + NSRect descriptionFrame = [self.descriptionTextField frame]; + + if (self.isShowingMoreInfo) + { + // Add the subview + contentViewFrame.size.height += profileMoreInfoViewFrame.size.height; + profileMoreInfoViewFrame.origin.y = profileMoreInfoButtonFrame.origin.y - profileMoreInfoViewFrame.size.height; + profileMoreInfoViewFrame.origin.x = descriptionFrame.origin.x; + profileMoreInfoViewFrame.size.width = descriptionFrame.size.width; + + windowFrame.size.height += profileMoreInfoViewFrame.size.height; + windowFrame.origin.y -= profileMoreInfoViewFrame.size.height; + + [self.moreInfoView setFrame:profileMoreInfoViewFrame]; + [self.moreInfoView setHidden:YES]; + [contentView addSubview:self.moreInfoView + positioned:NSWindowBelow + relativeTo:self.moreInfoButton]; + } else { + // Remove the subview + [self.moreInfoView setHidden:NO]; + [self.moreInfoView removeFromSuperview]; + contentViewFrame.size.height -= profileMoreInfoViewFrame.size.height; + + windowFrame.size.height -= profileMoreInfoViewFrame.size.height; + windowFrame.origin.y += profileMoreInfoViewFrame.size.height; + } + [[self window] setFrame:windowFrame display:YES animate:YES]; + [contentView setFrame:contentViewFrame]; + [contentView setNeedsDisplay:YES]; + [self.moreInfoView setHidden:!self.isShowingMoreInfo]; +} + +- (IBAction)finishPrompt:(id)sender +{ + if (![self.delegate respondsToSelector:@selector(updatePermissionPromptFinishedWithResult:)]) { + [NSException raise:@"SUInvalidDelegate" format:@"SUUpdatePermissionPrompt's delegate (%@) doesn't respond to updatePermissionPromptFinishedWithResult:!", self.delegate]; + } + [self.host setBool:self.shouldSendProfile forUserDefaultsKey:SUSendProfileInfoKey]; + [self.delegate updatePermissionPromptFinishedWithResult:([sender tag] == 1 ? SUAutomaticallyCheck : SUDoNotAutomaticallyCheck)]; + [[self window] close]; + [NSApp stopModal]; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUUpdater.h b/Frameworks/Sparkle/Sparkle/SUUpdater.h new file mode 100644 index 000000000..4c8385718 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUpdater.h @@ -0,0 +1,334 @@ +// +// SUUpdater.h +// Sparkle +// +// Created by Andy Matuschak on 1/4/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUUPDATER_H +#define SUUPDATER_H + +#import "SUVersionComparisonProtocol.h" +#import "SUVersionDisplayProtocol.h" + +@class SUUpdateDriver, SUAppcastItem, SUHost, SUAppcast; + +@protocol SUUpdaterDelegate; + +/*! + The main API in Sparkle for controlling the update mechanism. + + This class is used to configure the update paramters as well as manually + and automatically schedule and control checks for updates. + */ +@interface SUUpdater : NSObject + +@property (weak) IBOutlet id delegate; + ++ (SUUpdater *)sharedUpdater; ++ (SUUpdater *)updaterForBundle:(NSBundle *)bundle; +- (instancetype)initForBundle:(NSBundle *)bundle; + +@property (readonly, strong) NSBundle *hostBundle; + +@property BOOL automaticallyChecksForUpdates; + +@property NSTimeInterval updateCheckInterval; + +/*! + * The URL of the appcast used to download update information. + * + * This property must be called on the main thread. + */ +@property (copy) NSURL *feedURL; + +@property (nonatomic, copy) NSString *userAgentString; + +@property BOOL sendsSystemProfile; + +@property BOOL automaticallyDownloadsUpdates; + +/*! + Explicitly checks for updates and displays a progress dialog while doing so. + + This method is meant for a main menu item. + Connect any menu item to this action in Interface Builder, + and Sparkle will check for updates and report back its findings verbosely + when it is invoked. + */ +- (IBAction)checkForUpdates:(id)sender; + +/*! + Checks for updates, but does not display any UI unless an update is found. + + This is meant for programmatically initating a check for updates. That is, + it will display no UI unless it actually finds an update, in which case it + proceeds as usual. + + If the fully automated updating is turned on, however, this will invoke that + behavior, and if an update is found, it will be downloaded and prepped for + installation. + */ +- (void)checkForUpdatesInBackground; + +/*! + Returns the date of last update check. + + \returns \c nil if no check has been performed. + */ +@property (readonly, copy) NSDate *lastUpdateCheckDate; + +/*! + Begins a "probing" check for updates which will not actually offer to + update to that version. + + However, the delegate methods + SUUpdaterDelegate::updater:didFindValidUpdate: and + SUUpdaterDelegate::updaterDidNotFindUpdate: will be called, + so you can use that information in your UI. + */ +- (void)checkForUpdateInformation; + +/*! + Appropriately schedules or cancels the update checking timer according to + the preferences for time interval and automatic checks. + + This call does not change the date of the next check, + but only the internal NSTimer. + */ +- (void)resetUpdateCycle; + +@property (readonly) BOOL updateInProgress; + +@end + +// ----------------------------------------------------------------------------- +// SUUpdater Notifications for events that might be interesting to more than just the delegate +// The updater will be the notification object +// ----------------------------------------------------------------------------- +extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification; +extern NSString *const SUUpdaterDidFindValidUpdateNotification; +extern NSString *const SUUpdaterDidNotFindUpdateNotification; +extern NSString *const SUUpdaterWillRestartNotification; +#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification; +#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification; + +// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo +extern NSString *const SUUpdaterAppcastItemNotificationKey; +// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo +extern NSString *const SUUpdaterAppcastNotificationKey; + +// ----------------------------------------------------------------------------- +// SUUpdater Delegate: +// ----------------------------------------------------------------------------- + +/*! + Provides methods to control the behavior of an SUUpdater object. + */ +@protocol SUUpdaterDelegate +@optional + +/*! + Returns whether to allow Sparkle to pop up. + + For example, this may be used to prevent Sparkle from interrupting a setup assistant. + + \param updater The SUUpdater instance. + */ +- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)updater; + +/*! + Returns additional parameters to append to the appcast URL's query string. + + This is potentially based on whether or not Sparkle will also be sending along the system profile. + + \param updater The SUUpdater instance. + \param sendingProfile Whether the system profile will also be sent. + + \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user. + */ +- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile; + +/*! + Returns a custom appcast URL. + + Override this to dynamically specify the entire URL. + + \param updater The SUUpdater instance. + */ +- (NSString *)feedURLStringForUpdater:(SUUpdater *)updater; + +/*! + Returns whether Sparkle should prompt the user about automatic update checks. + + Use this to override the default behavior. + + \param updater The SUUpdater instance. + */ +- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater; + +/*! + Called after Sparkle has downloaded the appcast from the remote server. + + Implement this if you want to do some special handling with the appcast once it finishes loading. + + \param updater The SUUpdater instance. + \param appcast The appcast that was downloaded from the remote server. + */ +- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast; + +/*! + Returns the item in the appcast corresponding to the update that should be installed. + + If you're using special logic or extensions in your appcast, + implement this to use your own logic for finding a valid update, if any, + in the given appcast. + + \param appcast The appcast that was downloaded from the remote server. + \param updater The SUUpdater instance. + */ +- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)updater; + +/*! + Called when a valid update is found by the update driver. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be installed. + */ +- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item; + +/*! + Called when a valid update is not found. + + \param updater The SUUpdater instance. + */ +- (void)updaterDidNotFindUpdate:(SUUpdater *)updater; + +/*! + Called immediately before installing the specified update. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be installed. + */ +- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item; + +/*! + Returns whether the relaunch should be delayed in order to perform other tasks. + + This is not called if the user didn't relaunch on the previous update, + in that case it will immediately restart. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be installed. + \param invocation The invocation that must be completed before continuing with the relaunch. + + \return \c YES to delay the relaunch until \p invocation is invoked. + */ +- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvoking:(NSInvocation *)invocation; + +/*! + Returns whether the application should be relaunched at all. + + Some apps \b cannot be relaunched under certain circumstances. + This method can be used to explicitly prevent a relaunch. + + \param updater The SUUpdater instance. + */ +- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater; + +/*! + Called immediately before relaunching. + + \param updater The SUUpdater instance. + */ +- (void)updaterWillRelaunchApplication:(SUUpdater *)updater; + +/*! + Returns an object that compares version numbers to determine their arithmetic relation to each other. + + This method allows you to provide a custom version comparator. + If you don't implement this method or return \c nil, + the standard version comparator will be used. + + \sa SUStandardVersionComparator + + \param updater The SUUpdater instance. + */ +- (id)versionComparatorForUpdater:(SUUpdater *)updater; + +/*! + Returns an object that formats version numbers for display to the user. + + If you don't implement this method or return \c nil, + the standard version formatter will be used. + + \sa SUUpdateAlert + + \param updater The SUUpdater instance. + */ +- (id)versionDisplayerForUpdater:(SUUpdater *)updater; + +/*! + Returns the path which is used to relaunch the client after the update is installed. + + The default is the path of the host bundle. + + \param updater The SUUpdater instance. + */ +- (NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater; + +/*! + Called before an updater shows a modal alert window, + to give the host the opportunity to hide attached windows that may get in the way. + + \param updater The SUUpdater instance. + */ +- (void)updaterWillShowModalAlert:(SUUpdater *)updater; + +/*! + Called after an updater shows a modal alert window, + to give the host the opportunity to hide attached windows that may get in the way. + + \param updater The SUUpdater instance. + */ +- (void)updaterDidShowModalAlert:(SUUpdater *)updater; + +/*! + Called when an update is scheduled to be silently installed on quit. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be installed. + \param invocation Can be used to trigger an immediate silent install and relaunch. + */ +- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation; + +/*! + Calls after an update that was scheduled to be silently installed on quit has been canceled. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that was proposed to be installed. + */ +- (void)updater:(SUUpdater *)updater didCancelInstallUpdateOnQuit:(SUAppcastItem *)item; + +@end + + +// ----------------------------------------------------------------------------- +// Constants: +// ----------------------------------------------------------------------------- + +// Define some minimum intervals to avoid DOS-like checking attacks. These are in seconds. +#if defined(DEBUG) && DEBUG && 0 +#define SU_MIN_CHECK_INTERVAL 60 +#else +#define SU_MIN_CHECK_INTERVAL 60 * 60 +#endif + +#if defined(DEBUG) && DEBUG && 0 +#define SU_DEFAULT_CHECK_INTERVAL 60 +#else +#define SU_DEFAULT_CHECK_INTERVAL 60 * 60 * 24 +#endif + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUUpdater.m b/Frameworks/Sparkle/Sparkle/SUUpdater.m new file mode 100644 index 000000000..f8fcfc8b8 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUpdater.m @@ -0,0 +1,580 @@ +// +// SUUpdater.m +// Sparkle +// +// Created by Andy Matuschak on 1/4/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#import "SUUpdater.h" + +#import "SUHost.h" +#import "SUUpdatePermissionPrompt.h" + +#import "SUAutomaticUpdateDriver.h" +#import "SUProbingUpdateDriver.h" +#import "SUUserInitiatedUpdateDriver.h" +#import "SUScheduledUpdateDriver.h" +#import "SUConstants.h" +#import "SULog.h" +#import "SUCodeSigningVerifier.h" +#include + +NSString *const SUUpdaterDidFinishLoadingAppCastNotification = @"SUUpdaterDidFinishLoadingAppCastNotification"; +NSString *const SUUpdaterDidFindValidUpdateNotification = @"SUUpdaterDidFindValidUpdateNotification"; +NSString *const SUUpdaterDidNotFindUpdateNotification = @"SUUpdaterDidNotFindUpdateNotification"; +NSString *const SUUpdaterWillRestartNotification = @"SUUpdaterWillRestartNotificationName"; +NSString *const SUUpdaterAppcastItemNotificationKey = @"SUUpdaterAppcastItemNotificationKey"; +NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotificationKey"; + +@interface SUUpdater () +@property (strong) NSTimer *checkTimer; +- (instancetype)initForBundle:(NSBundle *)bundle; +- (void)startUpdateCycle; +- (void)checkForUpdatesWithDriver:(SUUpdateDriver *)updateDriver; +- (void)scheduleNextUpdateCheck; +- (void)registerAsObserver; +- (void)unregisterAsObserver; +- (void)updateDriverDidFinish:(NSNotification *)note; +@property (readonly, copy) NSURL *parameterizedFeedURL; + +- (void)notifyWillShowModalAlert; +- (void)notifyDidShowModalAlert; + +@property (strong) SUUpdateDriver *driver; +@property (strong) SUHost *host; + +@end + +@implementation SUUpdater + +@synthesize delegate; +@synthesize checkTimer; +@synthesize userAgentString = customUserAgentString; + +@synthesize driver; +@synthesize host; + +#pragma mark Initialization + +static NSMutableDictionary *sharedUpdaters = nil; +static NSString *const SUUpdaterDefaultsObservationContext = @"SUUpdaterDefaultsObservationContext"; + ++ (SUUpdater *)sharedUpdater +{ + return [self updaterForBundle:[NSBundle mainBundle]]; +} + +// SUUpdater has a singleton for each bundle. We use the fact that NSBundle instances are also singletons, so we can use them as keys. If you don't trust that you can also use the identifier as key ++ (SUUpdater *)updaterForBundle:(NSBundle *)bundle +{ + if (bundle == nil) bundle = [NSBundle mainBundle]; + id updater = sharedUpdaters[[NSValue valueWithNonretainedObject:bundle]]; + if (updater == nil) { + updater = [[[self class] alloc] initForBundle:bundle]; + } + return updater; +} + +// This is the designated initializer for SUUpdater, important for subclasses +- (instancetype)initForBundle:(NSBundle *)bundle +{ + self = [super init]; + if (bundle == nil) bundle = [NSBundle mainBundle]; + + // Register as observer straight away to avoid exceptions on -dealloc when -unregisterAsObserver is called: + if (self) { + [self registerAsObserver]; + } + + id updater = sharedUpdaters[[NSValue valueWithNonretainedObject:bundle]]; + if (updater) + { + self = updater; + } + else if (self) + { + if (sharedUpdaters == nil) { + sharedUpdaters = [[NSMutableDictionary alloc] init]; + } + sharedUpdaters[[NSValue valueWithNonretainedObject:bundle]] = self; + host = [[SUHost alloc] initWithBundle:bundle]; + + // Saving-the-developer-from-a-stupid-mistake-check: + BOOL hasPublicDSAKey = [host publicDSAKey] != nil; + BOOL isMainBundle = [bundle isEqualTo:[NSBundle mainBundle]]; + BOOL hostIsCodeSigned = [SUCodeSigningVerifier hostApplicationIsCodeSigned]; + if (!isMainBundle && !hasPublicDSAKey) { + [self notifyWillShowModalAlert]; + NSRunAlertPanel(@"Insecure update error!", @"For security reasons, you need to sign your updates with a DSA key. See Sparkle's documentation for more information.", @"OK", nil, nil); + [self notifyDidShowModalAlert]; + } else if (isMainBundle && !(hasPublicDSAKey || hostIsCodeSigned)) { + [self notifyWillShowModalAlert]; + NSRunAlertPanel(@"Insecure update error!", @"For security reasons, you need to code sign your application or sign your updates with a DSA key. See Sparkle's documentation for more information.", @"OK", nil, nil); + [self notifyDidShowModalAlert]; + } + + // This runs the permission prompt if needed, but never before the app has finished launching because the runloop won't run before that + [self performSelector:@selector(startUpdateCycle) withObject:nil afterDelay:0]; + } + return self; +} + + +// This will be used when the updater is instantiated in a nib such as MainMenu +- (instancetype)init +{ + return [self initForBundle:[NSBundle mainBundle]]; +} + +- (NSString *)description { return [NSString stringWithFormat:@"%@ <%@, %@>", [self class], [self.host bundlePath], [self.host installationPath]]; } + + +- (void)notifyWillShowModalAlert +{ + if ([self.delegate respondsToSelector:@selector(updaterWillShowModalAlert:)]) + [self.delegate updaterWillShowModalAlert:self]; +} + + +- (void)notifyDidShowModalAlert +{ + if ([self.delegate respondsToSelector:@selector(updaterDidShowModalAlert:)]) + [self.delegate updaterDidShowModalAlert:self]; +} + + +- (void)startUpdateCycle +{ + BOOL shouldPrompt = NO; + + // If the user has been asked about automatic checks, don't bother prompting + if ([self.host objectForUserDefaultsKey:SUEnableAutomaticChecksKey]) + { + shouldPrompt = NO; + } + // Does the delegate want to take care of the logic for when we should ask permission to update? + else if ([self.delegate respondsToSelector:@selector(updaterShouldPromptForPermissionToCheckForUpdates:)]) + { + shouldPrompt = [self.delegate updaterShouldPromptForPermissionToCheckForUpdates:self]; + } + // Has he been asked already? And don't ask if the host has a default value set in its Info.plist. + else if ([self.host objectForKey:SUEnableAutomaticChecksKey] == nil) + { + if ([self.host objectForUserDefaultsKey:SUEnableAutomaticChecksKeyOld]) { + [self setAutomaticallyChecksForUpdates:[self.host boolForUserDefaultsKey:SUEnableAutomaticChecksKeyOld]]; + } + // Now, we don't want to ask the user for permission to do a weird thing on the first launch. + // We wait until the second launch, unless explicitly overridden via SUPromptUserOnFirstLaunchKey. + else if (![self.host objectForKey:SUPromptUserOnFirstLaunchKey]) + { + if ([self.host boolForUserDefaultsKey:SUHasLaunchedBeforeKey] == NO) + [self.host setBool:YES forUserDefaultsKey:SUHasLaunchedBeforeKey]; + else + shouldPrompt = YES; + } + else + shouldPrompt = YES; + } + + if (shouldPrompt) + { + NSArray *profileInfo = [self.host systemProfile]; + // Always say we're sending the system profile here so that the delegate displays the parameters it would send. + if ([self.delegate respondsToSelector:@selector(feedParametersForUpdater:sendingSystemProfile:)]) { + profileInfo = [profileInfo arrayByAddingObjectsFromArray:[self.delegate feedParametersForUpdater:self sendingSystemProfile:YES]]; + } + [SUUpdatePermissionPrompt promptWithHost:self.host systemProfile:profileInfo delegate:self]; + // We start the update checks and register as observer for changes after the prompt finishes + } + else + { + // We check if the user's said they want updates, or they haven't said anything, and the default is set to checking. + [self scheduleNextUpdateCheck]; + } +} + +- (void)updatePermissionPromptFinishedWithResult:(SUPermissionPromptResult)result +{ + [self setAutomaticallyChecksForUpdates:(result == SUAutomaticallyCheck)]; + // Schedule checks, but make sure we ignore the delayed call from KVO + [self resetUpdateCycle]; +} + +- (void)updateDriverDidFinish:(NSNotification *)note +{ + if ([note object] == self.driver && [self.driver finished]) + { + self.driver = nil; + [self scheduleNextUpdateCheck]; + } +} + +- (NSDate *)lastUpdateCheckDate +{ + return [self.host objectForUserDefaultsKey:SULastCheckTimeKey]; +} + +- (void)scheduleNextUpdateCheck +{ + if (self.checkTimer) + { + [self.checkTimer invalidate]; + self.checkTimer = nil; // Timer is non-repeating, may have invalidated itself, so we had to retain it. + } + if (![self automaticallyChecksForUpdates]) return; + + // How long has it been since last we checked for an update? + NSDate *lastCheckDate = [self lastUpdateCheckDate]; + if (!lastCheckDate) { lastCheckDate = [NSDate distantPast]; } + NSTimeInterval intervalSinceCheck = [[NSDate date] timeIntervalSinceDate:lastCheckDate]; + + // Now we want to figure out how long until we check again. + NSTimeInterval delayUntilCheck, updateCheckInterval = [self updateCheckInterval]; + if (updateCheckInterval < SU_MIN_CHECK_INTERVAL) + updateCheckInterval = SU_MIN_CHECK_INTERVAL; + if (intervalSinceCheck < updateCheckInterval) + delayUntilCheck = (updateCheckInterval - intervalSinceCheck); // It hasn't been long enough. + else + delayUntilCheck = 0; // We're overdue! Run one now. + self.checkTimer = [NSTimer scheduledTimerWithTimeInterval:delayUntilCheck target:self selector:@selector(checkForUpdatesInBackground) userInfo:nil repeats:NO]; // Timer is non-repeating, may have invalidated itself, so we had to retain it. +} + + +- (void)putFeedURLIntoDictionary:(NSMutableDictionary *)theDict // You release this. +{ + theDict[@"feedURL"] = [self feedURL]; +} + +- (void)checkForUpdatesInBgReachabilityCheckWithDriver:(SUUpdateDriver *)inDriver /* RUNS ON ITS OWN THREAD */ +{ + @try { + // This method *must* be called on its own thread. SCNetworkReachabilityCheckByName + // can block, and it can be waiting a long time on slow networks, and we + // wouldn't want to beachball the main thread for a background operation. + // We could use asynchronous reachability callbacks, but those aren't + // reliable enough and can 'get lost' sometimes, which we don't want. + + @autoreleasepool { + SCNetworkConnectionFlags flags = 0; + BOOL isNetworkReachable = YES; + + // Don't perform automatic checks on unconnected laptops or dial-up connections that aren't online: + NSMutableDictionary *theDict = [NSMutableDictionary dictionary]; + dispatch_sync(dispatch_get_main_queue(), ^{ + [self putFeedURLIntoDictionary:theDict]; // Get feed URL on main thread, it's not safe to call elsewhere. + }); + + const char *hostname = [[(NSURL *)theDict[@"feedURL"] host] cStringUsingEncoding:NSUTF8StringEncoding]; + SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithName(NULL, hostname); + Boolean reachabilityResult = NO; + // If the feed's using a file:// URL, we won't be able to use reachability. + if (reachability != NULL) { + SCNetworkReachabilityGetFlags(reachability, &flags); + CFRelease(reachability); + } + + if( reachabilityResult ) + { + BOOL reachable = (flags & kSCNetworkFlagsReachable) == kSCNetworkFlagsReachable; + BOOL automatic = (flags & kSCNetworkFlagsConnectionAutomatic) == kSCNetworkFlagsConnectionAutomatic; + BOOL local = (flags & kSCNetworkFlagsIsLocalAddress) == kSCNetworkFlagsIsLocalAddress; + + if (!(reachable || automatic || local)) + isNetworkReachable = NO; + } + + // If the network's not reachable, we pass a nil driver into checkForUpdatesWithDriver, which will then reschedule the next update so we try again later. + dispatch_async(dispatch_get_main_queue(), ^{ + [self checkForUpdatesWithDriver: isNetworkReachable ? inDriver : nil]; + }); + + } + } @catch (NSException *localException) { + SULog(@"UNCAUGHT EXCEPTION IN UPDATE CHECK TIMER: %@", [localException reason]); + // Don't propagate the exception beyond here. In Carbon apps that would trash the stack. + } +} + + +- (void)checkForUpdatesInBackground +{ + // Background update checks should only happen if we have a network connection. + // Wouldn't want to annoy users on dial-up by establishing a connection every + // hour or so: + SUUpdateDriver *theUpdateDriver = [[([self automaticallyDownloadsUpdates] ? [SUAutomaticUpdateDriver class] : [SUScheduledUpdateDriver class])alloc] initWithUpdater:self]; + + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + [self checkForUpdatesInBgReachabilityCheckWithDriver:theUpdateDriver]; + }); +} + + +- (BOOL)mayUpdateAndRestart +{ + return (!self.delegate || ![self.delegate respondsToSelector:@selector(updaterShouldRelaunchApplication:)] || [self.delegate updaterShouldRelaunchApplication:self]); +} + +- (IBAction)checkForUpdates:(id)__unused sender +{ + if (self.driver && [self.driver isInterruptible]) { + [self.driver abortUpdate]; + } + + [self checkForUpdatesWithDriver:[[SUUserInitiatedUpdateDriver alloc] initWithUpdater:self]]; +} + +- (void)checkForUpdateInformation +{ + [self checkForUpdatesWithDriver:[[SUProbingUpdateDriver alloc] initWithUpdater:self]]; +} + +- (void)checkForUpdatesWithDriver:(SUUpdateDriver *)d +{ + if ([self updateInProgress]) { return; } + if (self.checkTimer) { [self.checkTimer invalidate]; self.checkTimer = nil; } // Timer is non-repeating, may have invalidated itself, so we had to retain it. + + SUClearLog(); + SULog(@"===== %@ =====", [[NSFileManager defaultManager] displayNameAtPath:[[NSBundle mainBundle] bundlePath]]); + + [self willChangeValueForKey:@"lastUpdateCheckDate"]; + [self.host setObject:[NSDate date] forUserDefaultsKey:SULastCheckTimeKey]; + [self didChangeValueForKey:@"lastUpdateCheckDate"]; + + if( [self.delegate respondsToSelector: @selector(updaterMayCheckForUpdates:)] && ![self.delegate updaterMayCheckForUpdates: self] ) + { + [self scheduleNextUpdateCheck]; + return; + } + + self.driver = d; + + // If we're not given a driver at all, just schedule the next update check and bail. + if (!self.driver) + { + [self scheduleNextUpdateCheck]; + return; + } + + NSURL *theFeedURL = [self parameterizedFeedURL]; + if (theFeedURL) // Use a NIL URL to cancel quietly. + [self.driver checkForUpdatesAtURL:theFeedURL host:self.host]; + else + [self.driver abortUpdate]; +} + +- (void)registerAsObserver +{ + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateDriverDidFinish:) name:SUUpdateDriverFinishedNotification object:nil]; + [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:[@"values." stringByAppendingString:SUScheduledCheckIntervalKey] options:(NSKeyValueObservingOptions)0 context:(__bridge void *)(SUUpdaterDefaultsObservationContext)]; + [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:[@"values." stringByAppendingString:SUEnableAutomaticChecksKey] options:(NSKeyValueObservingOptions)0 context:(__bridge void *)(SUUpdaterDefaultsObservationContext)]; +} + +- (void)unregisterAsObserver +{ + @try + { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + [[NSUserDefaultsController sharedUserDefaultsController] removeObserver:self forKeyPath:[@"values." stringByAppendingString:SUScheduledCheckIntervalKey]]; + [[NSUserDefaultsController sharedUserDefaultsController] removeObserver:self forKeyPath:[@"values." stringByAppendingString:SUEnableAutomaticChecksKey]]; + } + @catch (NSException *) + { + SULog(@"Error: [SUUpdater unregisterAsObserver] called, but the updater wasn't registered as an observer."); + } +} + +- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context +{ + if (context == (__bridge void *)(SUUpdaterDefaultsObservationContext)) + { + // Allow a small delay, because perhaps the user or developer wants to change both preferences. This allows the developer to interpret a zero check interval as a sign to disable automatic checking. + // Or we may get this from the developer and from our own KVO observation, this will effectively coalesce them. + [[self class] cancelPreviousPerformRequestsWithTarget:self selector:@selector(resetUpdateCycle) object:nil]; + [self performSelector:@selector(resetUpdateCycle) withObject:nil afterDelay:1]; + } + else + { + [super observeValueForKeyPath:keyPath ofObject:object change:change context:context]; + } +} + +- (void)resetUpdateCycle +{ + [[self class] cancelPreviousPerformRequestsWithTarget:self selector:@selector(resetUpdateCycle) object:nil]; + [self scheduleNextUpdateCheck]; +} + +- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyCheckForUpdates +{ + [self.host setBool:automaticallyCheckForUpdates forUserDefaultsKey:SUEnableAutomaticChecksKey]; + // Hack to support backwards compatibility with older Sparkle versions, which supported + // disabling updates by setting the check interval to 0. + if (automaticallyCheckForUpdates && (NSInteger)[self updateCheckInterval] == 0) { + [self setUpdateCheckInterval:SU_DEFAULT_CHECK_INTERVAL]; + } + [[self class] cancelPreviousPerformRequestsWithTarget:self selector:@selector(resetUpdateCycle) object:nil]; + // Provide a small delay in case multiple preferences are being updated simultaneously. + [self performSelector:@selector(resetUpdateCycle) withObject:nil afterDelay:1]; +} + +- (BOOL)automaticallyChecksForUpdates +{ + // Don't automatically update when the check interval is 0, to be compatible with 1.1 settings. + if ((NSInteger)[self updateCheckInterval] == 0) { + return NO; + } + return [self.host boolForKey:SUEnableAutomaticChecksKey]; +} + +- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyUpdates +{ + [self.host setBool:automaticallyUpdates forUserDefaultsKey:SUAutomaticallyUpdateKey]; +} + +- (BOOL)automaticallyDownloadsUpdates +{ + // If the SUAllowsAutomaticUpdatesKey exists and is set to NO, return NO. + if ([self.host objectForInfoDictionaryKey:SUAllowsAutomaticUpdatesKey] && [self.host boolForInfoDictionaryKey:SUAllowsAutomaticUpdatesKey] == NO) { + return NO; + } + + // Otherwise, automatically downloading updates is allowed. Does the user want it? + return [self.host boolForUserDefaultsKey:SUAutomaticallyUpdateKey]; +} + +- (void)setFeedURL:(NSURL *)feedURL +{ + if (![NSThread isMainThread]) + [NSException raise:@"SUThreadException" format:@"This method must be called on the main thread"]; + + [self.host setObject:[feedURL absoluteString] forUserDefaultsKey:SUFeedURLKey]; +} + +- (NSURL *)feedURL +{ + if (![NSThread isMainThread]) + [NSException raise:@"SUThreadException" format:@"This method must be called on the main thread"]; + + // A value in the user defaults overrides one in the Info.plist (so preferences panels can be created wherein users choose between beta / release feeds). + NSString *appcastString = [self.host objectForKey:SUFeedURLKey]; + if ([self.delegate respondsToSelector:@selector(feedURLStringForUpdater:)]) + appcastString = [self.delegate feedURLStringForUpdater:self]; + if (!appcastString) // Can't find an appcast string! + [NSException raise:@"SUNoFeedURL" format:@"You must specify the URL of the appcast as the %@ key in either the Info.plist or the user defaults!", SUFeedURLKey]; + NSCharacterSet *quoteSet = [NSCharacterSet characterSetWithCharactersInString:@"\"\'"]; // Some feed publishers add quotes; strip 'em. + NSString *castUrlStr = [appcastString stringByTrimmingCharactersInSet:quoteSet]; + if (!castUrlStr || [castUrlStr length] == 0) + return nil; + else + return [NSURL URLWithString:castUrlStr]; +} + +- (NSString *)userAgentString +{ + if (customUserAgentString) { + return customUserAgentString; + } + + NSString *version = [SPARKLE_BUNDLE objectForInfoDictionaryKey:@"CFBundleVersion"]; + NSString *userAgent = [NSString stringWithFormat:@"%@/%@ Sparkle/%@", [self.host name], [self.host displayVersion], version ? version : @"?"]; + NSData *cleanedAgent = [userAgent dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES]; + return [[NSString alloc] initWithData:cleanedAgent encoding:NSASCIIStringEncoding]; +} + +- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile +{ + [self.host setBool:sendsSystemProfile forUserDefaultsKey:SUSendProfileInfoKey]; +} + +- (BOOL)sendsSystemProfile +{ + return [self.host boolForKey:SUSendProfileInfoKey]; +} + +- (NSURL *)parameterizedFeedURL +{ + NSURL *baseFeedURL = [self feedURL]; + + // Determine all the parameters we're attaching to the base feed URL. + BOOL sendingSystemProfile = [self sendsSystemProfile]; + + // Let's only send the system profiling information once per week at most, so we normalize daily-checkers vs. biweekly-checkers and the such. + NSDate *lastSubmitDate = [self.host objectForUserDefaultsKey:SULastProfileSubmitDateKey]; + if (!lastSubmitDate) { + lastSubmitDate = [NSDate distantPast]; + } + const NSTimeInterval oneWeek = 60 * 60 * 24 * 7; + sendingSystemProfile &= (-[lastSubmitDate timeIntervalSinceNow] >= oneWeek); + + NSArray *parameters = @[]; + if ([self.delegate respondsToSelector:@selector(feedParametersForUpdater:sendingSystemProfile:)]) { + parameters = [parameters arrayByAddingObjectsFromArray:[self.delegate feedParametersForUpdater:self sendingSystemProfile:sendingSystemProfile]]; + } + if (sendingSystemProfile) + { + parameters = [parameters arrayByAddingObjectsFromArray:[self.host systemProfile]]; + [self.host setObject:[NSDate date] forUserDefaultsKey:SULastProfileSubmitDateKey]; + } + if ([parameters count] == 0) { return baseFeedURL; } + + // Build up the parameterized URL. + NSMutableArray *parameterStrings = [NSMutableArray array]; + for (NSDictionary *currentProfileInfo in parameters) { + [parameterStrings addObject:[NSString stringWithFormat:@"%@=%@", [[currentProfileInfo[@"key"] description] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding], [[currentProfileInfo[@"value"] description] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]]; + } + + NSString *separatorCharacter = @"?"; + if ([baseFeedURL query]) { + separatorCharacter = @"&"; // In case the URL is already http://foo.org/baz.xml?bat=4 + } + NSString *appcastStringWithProfile = [NSString stringWithFormat:@"%@%@%@", [baseFeedURL absoluteString], separatorCharacter, [parameterStrings componentsJoinedByString:@"&"]]; + + // Clean it up so it's a valid URL + return [NSURL URLWithString:appcastStringWithProfile]; +} + +- (void)setUpdateCheckInterval:(NSTimeInterval)updateCheckInterval +{ + [self.host setObject:@(updateCheckInterval) forUserDefaultsKey:SUScheduledCheckIntervalKey]; + if ((NSInteger)updateCheckInterval == 0) { // For compatibility with 1.1's settings. + [self setAutomaticallyChecksForUpdates:NO]; + } + [[self class] cancelPreviousPerformRequestsWithTarget:self selector:@selector(resetUpdateCycle) object:nil]; + + // Provide a small delay in case multiple preferences are being updated simultaneously. + [self performSelector:@selector(resetUpdateCycle) withObject:nil afterDelay:1]; +} + +- (NSTimeInterval)updateCheckInterval +{ + // Find the stored check interval. User defaults override Info.plist. + NSNumber *intervalValue = [self.host objectForKey:SUScheduledCheckIntervalKey]; + if (intervalValue) + return [intervalValue doubleValue]; + else + return SU_DEFAULT_CHECK_INTERVAL; +} + +- (void)dealloc +{ + [self unregisterAsObserver]; + if (checkTimer) { [checkTimer invalidate]; } // Timer is non-repeating, may have invalidated itself, so we had to retain it. +} + +- (BOOL)validateMenuItem:(NSMenuItem *)item +{ + if ([item action] == @selector(checkForUpdates:)) { + return ![self updateInProgress]; + } + return YES; +} + +- (BOOL)updateInProgress +{ + return self.driver && ([self.driver finished] == NO); +} + +- (NSBundle *)hostBundle { return [self.host bundle]; } + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUUpdater_Private.h b/Frameworks/Sparkle/Sparkle/SUUpdater_Private.h new file mode 100644 index 000000000..400915495 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUpdater_Private.h @@ -0,0 +1,15 @@ +// +// SUUpdater_Private.h +// Sparkle +// +// Created by Andy Matuschak on 5/9/11. +// Copyright 2011 Andy Matuschak. All rights reserved. +// + +#import "SUUpdater.h" + +@interface SUUpdater (Private) + +@property (readonly) BOOL mayUpdateAndRestart; + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUUserInitiatedUpdateDriver.h b/Frameworks/Sparkle/Sparkle/SUUserInitiatedUpdateDriver.h new file mode 100644 index 000000000..079d2fea7 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUserInitiatedUpdateDriver.h @@ -0,0 +1,19 @@ +// +// SUUserInitiatedUpdateDriver.h +// Sparkle +// +// Created by Andy Matuschak on 5/30/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUUSERINITIATEDUPDATEDRIVER_H +#define SUUSERINITIATEDUPDATEDRIVER_H + +#import +#import "SUUIBasedUpdateDriver.h" + +@interface SUUserInitiatedUpdateDriver : SUUIBasedUpdateDriver + +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUUserInitiatedUpdateDriver.m b/Frameworks/Sparkle/Sparkle/SUUserInitiatedUpdateDriver.m new file mode 100644 index 000000000..5dd66f298 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUUserInitiatedUpdateDriver.m @@ -0,0 +1,97 @@ +// +// SUUserInitiatedUpdateDriver.m +// Sparkle +// +// Created by Andy Matuschak on 5/30/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUUserInitiatedUpdateDriver.h" + +#import "SUStatusController.h" +#import "SUHost.h" + +@interface SUUserInitiatedUpdateDriver () + +@property (strong) SUStatusController *checkingController; +@property (assign, getter=isCanceled) BOOL canceled; + +@end + +@implementation SUUserInitiatedUpdateDriver + +@synthesize checkingController; +@synthesize canceled; + +- (void)closeCheckingWindow +{ + if (self.checkingController) + { + [[self.checkingController window] close]; + self.checkingController = nil; + } +} + +- (void)cancelCheckForUpdates:(id)__unused sender +{ + [self closeCheckingWindow]; + self.canceled = YES; +} + +- (void)checkForUpdatesAtURL:(NSURL *)URL host:(SUHost *)aHost +{ + self.checkingController = [[SUStatusController alloc] initWithHost:aHost]; + [[self.checkingController window] center]; // Force the checking controller to load its window. + [self.checkingController beginActionWithTitle:SULocalizedString(@"Checking for updates...", nil) maxProgressValue:0.0 statusText:nil]; + [self.checkingController setButtonTitle:SULocalizedString(@"Cancel", nil) target:self action:@selector(cancelCheckForUpdates:) isDefault:NO]; + [self.checkingController showWindow:self]; + [super checkForUpdatesAtURL:URL host:aHost]; + + // For background applications, obtain focus. + // Useful if the update check is requested from another app like System Preferences. + if ([aHost isBackgroundApplication]) + { + [NSApp activateIgnoringOtherApps:YES]; + } +} + +- (void)appcastDidFinishLoading:(SUAppcast *)ac +{ + if (self.isCanceled) + { + [self abortUpdate]; + return; + } + [self closeCheckingWindow]; + [super appcastDidFinishLoading:ac]; +} + +- (void)abortUpdateWithError:(NSError *)error +{ + [self closeCheckingWindow]; + [super abortUpdateWithError:error]; +} + +- (void)abortUpdate +{ + [self closeCheckingWindow]; + [super abortUpdate]; +} + +- (void)appcast:(SUAppcast *)ac failedToLoadWithError:(NSError *)error +{ + if (self.isCanceled) + { + [self abortUpdate]; + return; + } + [super appcast:ac failedToLoadWithError:error]; +} + +- (BOOL)itemContainsValidUpdate:(SUAppcastItem *)ui +{ + // We don't check to see if this update's been skipped, because the user explicitly *asked* if he had the latest version. + return [self hostSupportsItem:ui] && [self isItemNewer:ui]; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUVersionComparisonProtocol.h b/Frameworks/Sparkle/Sparkle/SUVersionComparisonProtocol.h new file mode 100644 index 000000000..d3fb3d2b9 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUVersionComparisonProtocol.h @@ -0,0 +1,29 @@ +// +// SUVersionComparisonProtocol.h +// Sparkle +// +// Created by Andy Matuschak on 12/21/07. +// Copyright 2007 Andy Matuschak. All rights reserved. +// + +#ifndef SUVERSIONCOMPARISONPROTOCOL_H +#define SUVERSIONCOMPARISONPROTOCOL_H + +#import + +/*! + Provides version comparison facilities for Sparkle. +*/ +@protocol SUVersionComparison + +/*! + An abstract method to compare two version strings. + + Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a, + and NSOrderedSame if they are equivalent. +*/ +- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; // *** MAY BE CALLED ON NON-MAIN THREAD! + +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUVersionDisplayProtocol.h b/Frameworks/Sparkle/Sparkle/SUVersionDisplayProtocol.h new file mode 100644 index 000000000..697f1a876 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUVersionDisplayProtocol.h @@ -0,0 +1,25 @@ +// +// SUVersionDisplayProtocol.h +// EyeTV +// +// Created by Uli Kusterer on 08.12.09. +// Copyright 2009 Elgato Systems GmbH. All rights reserved. +// + +#import + + +/*! + Applies special display formatting to version numbers. +*/ +@protocol SUVersionDisplay + +/*! + Formats two version strings. + + Both versions are provided so that important distinguishing information + can be displayed while also leaving out unnecessary/confusing parts. +*/ +- (void)formatVersion:(NSString **)inOutVersionA andVersion:(NSString **)inOutVersionB; + +@end diff --git a/Frameworks/Sparkle/Sparkle/SUWindowController.h b/Frameworks/Sparkle/Sparkle/SUWindowController.h new file mode 100644 index 000000000..0cd60191b --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUWindowController.h @@ -0,0 +1,20 @@ +// +// SUWindowController.h +// Sparkle +// +// Created by Andy Matuschak on 2/13/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifndef SUWINDOWCONTROLLER_H +#define SUWINDOWCONTROLLER_H + +#import + +@class SUHost; +@interface SUWindowController : NSWindowController +// We use this instead of plain old NSWindowController initWithWindowNibName so that we'll be able to find the right path when running in a bundle loaded from another app. +- (instancetype)initWithHost:(SUHost *)host windowNibName:(NSString *)nibName; +@end + +#endif diff --git a/Frameworks/Sparkle/Sparkle/SUWindowController.m b/Frameworks/Sparkle/Sparkle/SUWindowController.m new file mode 100644 index 000000000..874f76535 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/SUWindowController.m @@ -0,0 +1,27 @@ +// +// SUWindowController.m +// Sparkle +// +// Created by Andy Matuschak on 2/13/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#import "SUWindowController.h" +#import "SUHost.h" + +@implementation SUWindowController + +- (instancetype)initWithHost:(SUHost *)host windowNibName:(NSString *)nibName +{ + NSString *path = [[NSBundle bundleForClass:[self class]] pathForResource:nibName ofType:@"nib"]; + if (path == nil) // Slight hack to resolve issues with running Sparkle in debug configurations. + { + NSString *frameworkPath = [[[host bundle] sharedFrameworksPath] stringByAppendingPathComponent:@"Sparkle.framework"]; + NSBundle *framework = [NSBundle bundleWithPath:frameworkPath]; + path = [framework pathForResource:nibName ofType:@"nib"]; + } + self = [super initWithWindowNibPath:path owner:self]; + return self; +} + +@end diff --git a/Frameworks/Sparkle/Sparkle/Sparkle-Info.plist b/Frameworks/Sparkle/Sparkle/Sparkle-Info.plist new file mode 100644 index 000000000..eeba51315 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/Sparkle-Info.plist @@ -0,0 +1,28 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + + CFBundleIdentifier + org.andymatuschak.Sparkle + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + ${CURRENT_PROJECT_VERSION} git + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + + + diff --git a/Frameworks/Sparkle/Sparkle/Sparkle.h b/Frameworks/Sparkle/Sparkle/Sparkle.h new file mode 100644 index 000000000..954ca519f --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/Sparkle.h @@ -0,0 +1,22 @@ +// +// Sparkle.h +// Sparkle +// +// Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07) +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SPARKLE_H +#define SPARKLE_H + +// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless +// there are name-space collisions) so we can list all of them to start with: + +#import + +#import +#import +#import +#import + +#endif diff --git a/Frameworks/Sparkle/Sparkle/Sparkle.pch b/Frameworks/Sparkle/Sparkle/Sparkle.pch new file mode 100644 index 000000000..62f19dfa3 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/Sparkle.pch @@ -0,0 +1,18 @@ +// +// Sparkle.pch +// Sparkle +// +// Created by Andy Matuschak on 7/23/08. +// Copyright 2008 Andy Matuschak. All rights reserved. +// + +#ifdef __OBJC__ + +#define SPARKLE_BUNDLE [NSBundle bundleWithIdentifier:@"org.andymatuschak.Sparkle"] +#define SULocalizedString(key,comment) NSLocalizedStringFromTableInBundle(key, @"Sparkle", SPARKLE_BUNDLE, comment) +#define SUAbstractFail() NSAssert2(nil, @"Can't call %@ on an instance of %@; this is an abstract method!", __PRETTY_FUNCTION__, [self class]); + +#import +#import "SUConstants.h" + +#endif diff --git a/Frameworks/Sparkle/Sparkle/ar.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/ar.lproj/SUAutomaticUpdateAlert.xib new file mode 100755 index 000000000..ffd6fc0ab --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ar.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ar.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/ar.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..71173bce5 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ar.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ar.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/ar.lproj/SUUpdatePermissionPrompt.xib new file mode 100755 index 000000000..d3e44c866 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ar.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this. + +This is the information that would be sent: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ar.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/ar.lproj/Sparkle.strings new file mode 100644 index 000000000..ce77b6525 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ar.lproj/Sparkle.strings @@ -0,0 +1,79 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "تم تنزيل %1$@ %2$@ وهو جاهز للاستخدام، هل ترغب بتثبيت التحديث وإعادة تشغيل %1$@ الآن؟"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "لا يمكن تحديث %1$@ إذا شُغّل من وحدة تخزين للقراءة فقط كصورة قرص أو قارئ الأقراص الضوئية. انقل %1$@ إلى مجلد التطبيقات وأعد تشغيله من هناك ثم حاول مجددًا."; + +"%@ %@ is currently the newest version available." = "الإصدار %2$@ هو أحدث إصدار متوفر حاليًا لتطبيق %1$@"; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "لديك الإصدار %3$@ من تطبيق %1$@، هل ترغب بتزيل الإصدار %2$@ الآن"; + +"%@ downloaded" = "تم تنزيل %@"; + +"%@ of %@" = "%1$@ من %2$@"; + +"A new version of %@ is available!" = "يتوفر إصدار جديد من تطبيق %@"; + +"A new version of %@ is ready to install!" = "الإصدار الجديد من تطبيق %@ جاهز للتثبيت"; + +"An error occurred in retrieving update information. Please try again later." = "حال خطأ دون الحصول على معلومات حول التحديث، الرجاء المحاولة لاحقًا."; + +"An error occurred while downloading the update. Please try again later." = "حدث خطأ أثناء تنزيل التحديث، الرجاء المحاولة لاحقًا."; + +"An error occurred while extracting the archive. Please try again later." = "حدث خطأ أثناء استخراج الأرشيف، الرجاء المحاولة لاحقًا."; + +"An error occurred while installing the update. Please try again later." = "حدث خطأ أثناء تثبيت التحديث، الرجاء المحاولة لاحقًا."; + +"An error occurred while parsing the update feed." = "حدث خطأ أثناء تحليل المعلومات المزوّدَة حول التحديث."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "حدث خطأ أثناء إعادة تشغيل %1$@، إلا أن الإصدار الجديد سيكون متوفرًا في المرة القادمة التي تشغل فيها %1$@"; + +/* the unit for bytes */ +"B" = "بايت"; + +"Cancel" = "إلغاء"; + +"Cancel Update" = "إلغاء التحديث"; + +"Checking for updates..." = "يجري التحقق من وجود تحديثات..."; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "يجري تنزيل التحديث..."; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "يجري استخراج التحديث..."; + +/* the unit for gigabytes */ +"GB" = "غيغا بايت"; + +"Install and Relaunch" = "تثبيت وإعادة تشغيل التطبيق"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "يجري تثبيت التحديث..."; + +/* the unit for kilobytes */ +"KB" = "كيلو بايت"; + +/* the unit for megabytes */ +"MB" = "ميغا بايت"; + +/* OK button. */ +"OK" = "موافق"; + +/* Status message on progress window once download has finished. */ +"Ready to Install" = "جاهز للتثبيت"; + +/* Message that is optionally shown at startup to allow users to turn on/off update checks. */ +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "هل ترغب في أن يتحقق %1$@ من وجود تحديثات تلقائيًا؟ يمكنك التحقق من وجود تحديثات يدويًا في أي وقت من قائمة %1$@."; + +"Update Error!" = "حدث خطأ أثناء التحديث"; + +"Updating %@" = "تحديث %@"; + +/* 'Error' message when the user checks for updates but is already current or the feed doesn't contain any updates. (not necessarily shown in UI) */ +"You already have the newest version of %@." ="لديك أحدث إصدار من تطبيق %@"; + +/* 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!" = "لديك أحدث إصدار"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ +"Learn More..." = "مزيد من التفاصيل..."; diff --git a/Frameworks/Sparkle/Sparkle/ca.lproj/SUAutomaticUpdateAlert.strings b/Frameworks/Sparkle/Sparkle/ca.lproj/SUAutomaticUpdateAlert.strings new file mode 100644 index 000000000..8d3ab4eef --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ca.lproj/SUAutomaticUpdateAlert.strings @@ -0,0 +1,12 @@ +/* NSWindow () : (oid:5) */ +"" = ""; + +/* NSButton (Automatically download and install updates in the future) : (oid:17) */ +"Automatically download and install updates in the future" = "Baixa i instal·la les actualitzacions automàticament en el futur"; + +/* NSButton (Relaunch Later) : (oid:16) */ +"Relaunch Later" = "Reinicia el programa més tard"; + +/* NSButton (Relaunch Now) : (oid:15) */ +"Relaunch Now" = "Reinicia el programa ara"; + diff --git a/Frameworks/Sparkle/Sparkle/ca.lproj/SUUpdateAlert.strings b/Frameworks/Sparkle/Sparkle/ca.lproj/SUUpdateAlert.strings new file mode 100644 index 000000000..d02d071e2 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ca.lproj/SUUpdateAlert.strings @@ -0,0 +1,18 @@ +/* NSButton (Automatically download and install updates in the future) : (oid:92) */ +"Automatically download and install updates in the future" = "Descarrega i instal·la les actualitzacions automàticament en el futur"; + +/* NSButton (Install Update) : (oid:76) */ +"Install Update" = "Instal·la l'actualització"; + +/* NSTextField (Release Notes:) : (oid:17) */ +"Release Notes:" = "Notes d'aquesta versió:"; + +/* NSButton (Remind Me Later) : (oid:22) */ +"Remind Me Later" = "Recorda-m'ho més tard"; + +/* NSButton (Skip This Version) : (oid:23) */ +"Skip This Version" = "Omet aquesta versió"; + +/* NSWindow (Software Update) : (oid:5) */ +"Software Update" = "Actualització del programari"; + diff --git a/Frameworks/Sparkle/Sparkle/ca.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/ca.lproj/Sparkle.strings new file mode 100644 index 000000000..d0ab278c4 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ca.lproj/Sparkle.strings @@ -0,0 +1,54 @@ +"%@ of %@" = "%1$@ de %2$@"; + +"%1$@ can't be updated when it's running from a disk image. Move %1$@ to your Applications folder, relaunch it, and try again." = "%1$@ no es pot actualitzar quan funciona des d'un disc d'imatge. Moveu %1$@ al vostre directori Aplicacions, reinicieu-lo, i torneu a provar-ho."; + +"%@ %@ has been installed and will be ready to use next time %@ starts! Would you like to relaunch now?" = "%@ %@ ha estat instal·lat i estarà llest per a ser utilitzat la propera vegada que s'iniciï %@! Voleu reiniciar ara?"; + +"%@ %@ is currently the newest version available." = "%@ %@ és la versió disponible més actual."; + +"%@ %@ is now available (you have %@). Would you like to download it now?" = "%@ %@ està disponible (ara teniu %@). Voleu actualitzar?"; + +"%@ does not have permission to write to the application's directory! Are you running off a disk image? If not, ask your system administrator for help." = "%@ no té permís per escriure al directori d'aplicacions! Esteu executant el programa des d'un disc d'imatge? Si no és així, demaneu ajuda al vostre administrador."; + +"A new version of %@ has been installed!" = "S'ha instal·lat una nova versió de %@!"; + +"A new version of %@ is available!" = "Hi ha una nova versió de %@ disponible!"; + +"An error occurred during installation. Please try again later." = "Hi ha hagut un error durant la instal·lació. Torneu-ho a provar més tard."; + +"An error occurred in retrieving update information. Please try again later." = "Hi ha hagut un error obtenint la informació d'actualització. Torneu a provar-ho més tard."; + +"An error occurred while extracting the archive. Please try again later." = "Hi ha hagut un error al extreure l'arxiu? Torneu a provar-ho més tard."; + +"An error occurred while trying to download the file. Please try again later." = "Hi ha hagut un error al intentar descarregar el fitxer. Torneu a provar-ho més tard."; + +"An update is already in progress!" = "Ja hi ha una actualització en progrés!"; + +"Cancel" = "Cancel·la"; + +"Check for updates on startup?" = "Comprovar si hi ha actualitzacions a l'inici?"; + +"Downloading update..." = "Descarregant l'actualització…"; + +"Extracting update..." = "Extraient l'actualització…"; + +"Install and Relaunch" = "Instal·la i reinicia"; + +"Installing update..." = "Instal·lant l'actualització…"; + +"No" = "No"; + +"OK" = "D'acord"; + +"Ready to Install" = "A punt per instal·lar"; + +"Update Error!" = "Error d'actualització!"; + +"Updating %@" = "Actualitzant %@"; + +"Would you like %@ to check for updates on startup? If not, you can initiate the check manually from the %@ menu." = "Voleu que %@ comprovi si hi ha noves actualitzacions al iniciar? Si no, podeu inciar la comprovació manualment des del menú @."; + +"Yes" = "Sí"; + +"You're up to date!" = "Ja esteu al dia!"; + diff --git a/Frameworks/Sparkle/Sparkle/cs.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/cs.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..f383c339a --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/cs.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/cs.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/cs.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..e1ed9f804 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/cs.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/cs.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/cs.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..382869990 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/cs.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Informace z anonymního systémového profilu pomáhají vývojářům lépe plánovat budoucí vývoj aplikace +Obraťte se na nás v případě, že budete mít k němu nějaký dotaz. + +Tyto informace by měli být odeslány: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/cs.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/cs.lproj/Sparkle.strings new file mode 100644 index 000000000..843f0b2f5 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/cs.lproj/Sparkle.strings @@ -0,0 +1,71 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ byl instalován a je připraven k použití po příštím spuštění. Přejete si aplikaci %1$@ nyní nainstalovat a znovu spustit?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "Aplikace %1$@ nemůže být aktualizována, protože je spuštěna z nezapisovatelného média. Může to být CD/DVD-ROM, obraz disku nebo jen nemáte právo zápisu na disk. Přesuňte aplikaci %1$@ do vaší složky Aplikace, spusťte ji z tohoto umístěni znovu."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ je nejnovější dostupná verze"; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "Je k dispozici %1$@ %2$@ - máte %3$@. Přejete si nyní zkopírovat aktualizaci?"; + +"%@ downloaded" = "zkopírováno %@"; + +"%@ of %@" = "%1$@ z %2$@"; + +"A new version of %@ is available!" = "Je dostupná nová verze aplikace %@!"; + +"A new version of %@ is ready to install!" = "Nová verze %@ je připravena k instalaci!"; + +"An error occurred in retrieving update information. Please try again later." = "Při získávání údajů o aktualizaci se vyskytla chyba. Zkuste to prosím později."; + +"An error occurred while downloading the update. Please try again later." = "Při kopírování souboru se vyskytla chyba. Zkuste to prosím později."; + +"An error occurred while extracting the archive. Please try again later." = "Při rozbalování archivu se vyskytla chyba. Zkuste to prosím později."; + +"An error occurred while installing the update. Please try again later." = "Při instalování aktualizace se vyskytla chyba. Zkuste to prosím později."; + +"An error occurred while parsing the update feed." = "Při zpracovávání údajů o aktualizaci se vyskytla chyba. Zkuste to prosím později."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Vyskytla se chyba při novém spouštění aplikace %1$@, ale nová verze bude dostupná při dalším spuštění %1$@."; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Zrušit"; + +"Cancel Update" = "Zrušit aktualizaci"; + +"Checking for updates..." = "Ověřuje se dostupnost aktualizací…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Kopíruje se aktualizace…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Rozbaluje se aktualizace…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Instalovat a znovu spustit"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Instaluje se aktualizace…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +"OK" = "Budiž"; + +"Ready to Install" = "Připraveno k instalaci"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Přejete si, aby aplikace %1$@ automaticky ověřovala dostupnost aktualizací? Tuto volbu můžete kdykoliv změnit v nabídce %1$@."; + +"Update Error!" = "Chyba při aktualizaci!"; + +"Updating %@" = "Aktualizuje se %@"; + +"You already have the newest version of %@." = "Máte nainstalovanou nejnovější verzi aplikace @."; + +"You're up to date!" = "Vaše verze je aktuální!"; + diff --git a/Frameworks/Sparkle/Sparkle/cy.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/cy.lproj/Sparkle.strings new file mode 100644 index 000000000..a9b47b259 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/cy.lproj/Sparkle.strings @@ -0,0 +1,52 @@ +"%@ of %@" = "%1$@ of %2$@"; + +"%@ %@ has been installed and will be ready to use next time %@ starts! Would you like to relaunch now?" = "%1$@ %2$@ has been installed and will be ready to use next time %3$@ starts! Would you like to relaunch now?"; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ is currently the newest version available."; + +"%@ %@ is now available (you have %@). Would you like to download it now?" = "%1$@ %2$@ is now available (you have %3$@). Would you like to download it now?"; + +"%@ does not have permission to write to the application's directory! Are you running off a disk image? If not, ask your system administrator for help." = "%@ does not have permission to write to the application's directory! Are you running off a disk image? If not, ask your system administrator for help."; + +"A new version of %@ has been installed!" = "A new version of %@ has been installed!"; + +"A new version of %@ is available!" = "A new version of %@ is available!"; + +"An error occurred during installation. Please try again later." = "An error occurred during installation. Please try again later."; + +"An error occurred in retrieving update information. Please try again later." = "An error occurred in retrieving update information. Please try again later."; + +"An error occurred while extracting the archive. Please try again later." = "An error occurred while extracting the archive. Please try again later."; + +"An error occurred while trying to download the file. Please try again later." = "An error occurred while trying to download the file. Please try again later."; + +"An update is already in progress!" = "An update is already in progress!"; + +"Cancel" = "Cancel"; + +"Check for updates on startup?" = "Check for updates on startup?"; + +"Downloading update..." = "Downloading update…"; + +"Extracting update..." = "Extracting update…"; + +"Install and Relaunch" = "Install and Relaunch"; + +"Installing update..." = "Installing update…"; + +"No" = "No"; + +"OK" = "OK"; + +"Ready to Install" = "Ready to Install"; + +"Update Error!" = "Update Error!"; + +"Updating %@" = "Updating %@"; + +"Would you like %@ to check for updates on startup? If not, you can initiate the check manually from the application menu." = "Would you like %@ to check for updates on startup? If not, you can initiate the check manually from the application menu."; + +"Yes" = "Yes"; + +"You're up to date!" = "You're up to date!"; + diff --git a/Frameworks/Sparkle/Sparkle/da.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/da.lproj/SUAutomaticUpdateAlert.xib new file mode 100755 index 000000000..e306261ae --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/da.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/da.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/da.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..78ab21b51 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/da.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/da.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/da.lproj/SUUpdatePermissionPrompt.xib new file mode 100755 index 000000000..1be6db569 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/da.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this. + +This is the information that would be sent: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/da.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/da.lproj/Sparkle.strings new file mode 100644 index 000000000..f098528d1 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/da.lproj/Sparkle.strings @@ -0,0 +1,80 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ er hentet og klar til brug! Vil du installere og genstarte %1$@ nu?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ kan ikke opdateres når det køres fra en kun læsbar enhed. Flyt %1$@ til mappen Programmer, genstart derfra og prøv igen."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ er den aktuelle version."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ er tilgængelig! Du har %3$@. Skal den hentes nu?"; + +"%@ downloaded" = "%@ hentet"; + +"%@ of %@" = "%1$@ af %2$@"; + +"A new version of %@ is available!" = "En ny version af %@ er tilgængelig!"; + +"A new version of %@ is ready to install!" = "En ny version af %@ er klar til installering!"; + +"An error occurred in retrieving update information. Please try again later." = "Kunne ikke modtage informationer om opdateringer. Kontroller at du har forbindelse til internettet eller prøv igen senere."; + +"An error occurred while downloading the update. Please try again later." = "Opdateringen kunne ikke hentes. Prøv igen senere."; + +"An error occurred while extracting the archive. Please try again later." = "Arkivet kunne ikke udpakkes. Prøv igen senere."; + +"An error occurred while installing the update. Please try again later." = "Opdateringen kunne ikke installeres. Prøv igen senere."; + +"An error occurred while parsing the update feed." = "An error occurred while parsing the update feed."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "%1$@ kunne ikke genstartes. Den nye version vil være tilgængelig, næste gang %1$@ startes."; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Annuller"; + +"Cancel Update" = "Annuller opdatering"; + +"Checking for updates..." = "Søger efter opdateringer…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Henter opdatering…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Udpakker arkiver…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Installer og genstart"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Installerer opdatering…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +/* OK button. */ +"OK" = "OK"; + +/* Status message on progress window once download has finished. */ +"Ready to Install" = "Klar til installering"; + +/* Message that is optionally shown at startup to allow users to turn on/off update checks. */ +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Skal %1$@ søge efter opdateringer automatisk? Du kan altid søge efter opdateringer manuelt fra programmets menu."; + +"Update Error!" = "Der opstod en fejl!"; + +"Updating %@" = "Opdaterer %@"; + +/* 'Error' message when the user checks for updates but is already current or the feed doesn't contain any updates. (not necessarily shown in UI) */ +"You already have the newest version of %@." = "Du har den seneste version af %@."; + +/* 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!" = "Der er ingen opdateringer"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ +"Learn More..." = "Læs mere…"; + diff --git a/Frameworks/Sparkle/Sparkle/de.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/de.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..0bc4fc975 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/de.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/de.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/de.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..0b661de8b --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/de.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/de.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/de.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..5c108c355 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/de.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Das anonymisierte Systemprofil unterstützt uns bei der zukünftigen Entwicklung. Bitte kontaktieren Sie uns, wenn Sie Fragen hierzu haben. + +Diese Informationen würden an uns gesendet: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/de.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/de.lproj/Sparkle.strings new file mode 100644 index 000000000..056741904 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/de.lproj/Sparkle.strings @@ -0,0 +1,75 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ wurde heruntergeladen und steht zur Verwendung bereit! Möchten Sie %1$@ jetzt durch die neue Version ersetzen und neu starten?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ kann nicht aktualisiert werden, wenn es von einem Volumen ohne Schreibzugriff (z.B. Disk Image oder CD/DVD) gestartet wurde. Kopieren Sie %1$@ in den Programme Ordner, aktualisieren Sie es von dort."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ ist zur Zeit die neueste verfügbare Version."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ ist verfügbar (Sie verwenden Version %3$@). Möchten Sie die neue Version jetzt herunterladen?"; + +"%@ downloaded" = "%@ heruntergeladen"; + +"%@ of %@" = "%1$@ von %2$@"; + +"A new version of %@ is available!" = "Eine neue Version von %@ ist verfügbar!"; + +"A new version of %@ is ready to install!" = "Eine neue Version von %@ ist zur Installation bereit!"; + +"An error occurred in retrieving update information. Please try again later." = "Bei der Aktualisierung trat ein Fehler auf. Bitte versuchen Sie es später erneut."; + +"An error occurred while downloading the update. Please try again later." = "Beim Herunterladen ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut."; + +"An error occurred while extracting the archive. Please try again later." = "Beim Entpacken der Daten ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut."; + +"An error occurred while installing the update. Please try again later." = "Bei der Installation der Aktualisierung ist ein Fehler aufgetreten. Bitte versuchen Sie es später erneut."; + +"An error occurred while parsing the update feed." = "Beim Lesen der Aktualisierungsinformationen ist ein Fehler aufgetreten."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Beim erneuten Starten von %1$@ ist ein Fehler aufgetreten. Die neue Version von %1$@ steht beim nächsten Programmstart zur Verfügung."; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Abbrechen"; + +"Cancel Update" = "Aktualisierung abbrechen"; + +"Checking for updates..." = "Suche nach Aktualisierungen…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Aktualisierung wird heruntergeladen…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Aktualisierung entpacken…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Installieren und erneut starten"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Aktualisierung installieren…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +"OK" = "OK"; + +"Ready to Install" = "Bereit zum Installieren"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Soll %1$@ automatisch nach Aktualisierungen suchen? Sie können im %1$@-Menü auch manuell nach Aktualisierungen suchen."; + +"Update Error!" = "Fehler beim Aktualisieren!"; + +"Updating %@" = "Aktualisierung von %@"; + +"You already have the newest version of %@." = "Sie haben bereits die neueste Version von %@."; + +"You're up-to-date!" = "Sie sind auf dem neuesten Stand!"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ + +"Learn More..." = "Mehr über…"; diff --git a/Frameworks/Sparkle/Sparkle/el.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/el.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..634566a28 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/el.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/el.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/el.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..83fe668cc --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/el.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/el.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/el.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..832b7112d --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/el.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Το ανώνυμο προφίλ συστήματος χρησιμοποιείται για να μας βοηθήσει σε μελλοντική ανάπτυξη του προγράμματος. Παρακαλώ επικοινωνήστε μαζί μας άν έχετε ερωτήσεις. + +Αυτές είναι οι πληροφορίες που θα σταλούν: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/el.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/el.lproj/Sparkle.strings new file mode 100644 index 000000000..dca6fa5c9 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/el.lproj/Sparkle.strings @@ -0,0 +1,71 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "Το %1$@ %2$@ έχει ληφθεί και είναι έτοιμο προς χρήση! Θα θέλατε να το εγκαταστήσετε και να επανεκκινήσετε το %1$@ τώρα;"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "Το %1$@ δεν μπορεί να ενημερωθεί όσο τρέχει από έναν δίσκο ανάγνωσης-μόνο ή έναν οπτικό δίσκο. Μεταφέρετε το %1$@ στον φάκελο εφαρμογών σας, επανεκκινήστε το από εκεί, και ξαναδοκιμάστε."; + +"%@ %@ is currently the newest version available." = "Το %1$@ %2$@ είναι η τελευταία διαθέσιμη έκδοση."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "Το %1$@ %2$@ είναι πλέον διαθέσιμο--έχετε το %3$@. Θέλετε να το κατεβάσετε τώρα;"; + +"%@ downloaded" = "%@ λήφθησαν"; + +"%@ of %@" = "%1$@ από %2$@"; + +"A new version of %@ is available!" = "Μία νέα έκδοση του %@ είναι διαθέσιμη!"; + +"A new version of %@ is ready to install!" = "Μία νέα έκδοση του %@ είναι έτοιμη για εγκατάσταση!"; + +"An error occurred in retrieving update information. Please try again later." = "Υπήρξε ένα σφάλμα κατά την ανάκτηση των πληροφοριών ενημέρωσης. Παρακαλώ δοκιμάστε αργότερα."; + +"An error occurred while downloading the update. Please try again later." = "Υπήρξε ένα σφάλμα κατά την λήψη της ενημέρωσης. Παρακαλώ δοκιμάστε αργότερα."; + +"An error occurred while extracting the archive. Please try again later." = "Υπήρξε ένα σφάλμα κατά την εξαγωγή του αρχείου. Παρακαλώ δοκιμάστε αργότερα."; + +"An error occurred while installing the update. Please try again later." = "Υπήρξε ένα σφάλμα κατά την εγκατάσταση της ενημέρωσης. Παρακαλώ δοκιμάστε αργότερα."; + +"An error occurred while parsing the update feed." = "Υπήρξε ένα σφάλμα κατά την ανάλυση του feed ενημερώσεων."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Υπήρξε ένα σφάλμα κατά την επανεκκίνηση του %1$@, αλλά η νέα έκδοση θα είναι διαθέσιμη την επόμενη φορά που θα τρέξετε το %1$@."; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Ακύρωση"; + +"Cancel Update" = "Ακύρωση Ενημέρωσης"; + +"Checking for updates..." = "Έλεγχος για ενημερώσεις..."; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Λήψη ενημέρωσης..."; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Εξαγωγή ενημέρωσης..."; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Εγκατάσταση και Επανεκκίνηση"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Εγκατάσταση ενημέρωσης..."; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +"OK" = "OK"; + +"Ready to Install" = "Έτοιμο προς Εγκατάσταση"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Θέλετε το %1$@ να ελέγχει αυτόματα για ενημερώσεις; Μπορείτε πάντα να ελέγχετε για ενημερώσεις χειροκίνητα από το μενού %1$@."; + +"Update Error!" = "Σφάλμα Ενημέρωσης!"; + +"Updating %@" = "Ενημέρωση %@"; + +"You already have the newest version of %@." = "Έχετε ήδη την τελευταία έκδοση του %@."; + +"You're up-to-date!" = "Είστε ενημερωμένοι!"; + diff --git a/Frameworks/Sparkle/Sparkle/en.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/en.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..c707f6c3b --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/en.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/en.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/en.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..c1178be9d --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/en.lproj/SUUpdateAlert.xib @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/en.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/en.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..149753b1e --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/en.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this. + +This is the information that would be sent: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/en.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/en.lproj/Sparkle.strings new file mode 100644 index 000000000..50c54b029 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/en.lproj/Sparkle.strings @@ -0,0 +1,85 @@ +"%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$@ 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$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ can’t be updated when it’s running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ is currently the newest version available."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ is now available—you have %3$@. Would you like to download it now?"; + +"%@ downloaded" = "%@ downloaded"; + +"%@ of %@" = "%1$@ of %2$@"; + +"A new version of %@ is available!" = "A new version of %@ is available!"; + +"A new version of %@ is ready to install!" = "A new version of %@ is ready to install!"; + +"An error occurred in retrieving update information. Please try again later." = "An error occurred in retrieving update information. Please try again later."; + +"An error occurred while downloading the update. Please try again later." = "An error occurred while downloading the update. Please try again later."; + +"An error occurred while extracting the archive. Please try again later." = "An error occurred while extracting the archive. Please try again later."; + +"An error occurred while installing the update. Please try again later." = "An error occurred while installing the update. Please try again later."; + +"An error occurred while parsing the update feed." = "An error occurred while parsing the update feed."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@."; + +"An important update to %@ is ready to install" = "An important update to %@ is ready to install"; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Cancel"; + +"Cancel Update" = "Cancel Update"; + +"Checking for updates..." = "Checking for updates…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Downloading update…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Extracting update…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Install and Relaunch"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Installing update…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ +"Learn More..." = "Learn More…"; + +/* the unit for megabytes */ +"MB" = "MB"; + +/* OK button. */ +"OK" = "OK"; + +/* Status message on progress window once download has finished. */ +"Ready to Install" = "Ready to Install"; + +/* Message that is optionally shown at startup to allow users to turn on/off update checks. */ +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu."; + +"The update is improperly signed." = "The update is improperly signed."; + +"Update Error!" = "Update Error!"; + +"Updating %@" = "Updating %@"; + +/* 'Error' message when the user checks for updates but is already current or the feed doesn't contain any updates. (not necessarily shown in UI) */ +"You already have the newest version of %@." = "You already have the newest version of %@."; + +/* 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!"; diff --git a/Frameworks/Sparkle/Sparkle/es.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/es.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..98a58ab89 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/es.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/es.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/es.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..551ac126f --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/es.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/es.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/es.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..9c0f5ae87 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/es.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + La información de perfil de sistema anónimo se usa para ayudarnos a planear el trabajo de desarrollo futuro. Por favor, póngase en cantacto con nosotros si tiene preguntas sobre esto. + +Esta es la información que se nos enviaría: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/es.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/es.lproj/Sparkle.strings new file mode 100644 index 000000000..12eb5b46a --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/es.lproj/Sparkle.strings @@ -0,0 +1,75 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ se han descargado y están listos para utilizar. ¿Le gustaría instalar e iniciar %1$@ ahora?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ no se puede actualizar cuando se ejecuta desde un volumen de sólo lectura como imagen de disco o medio óptico. Mueva %1$@ a su carpeta de Aplicaciones y trate de iniciarlo desde allí."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ es la última versión disponible."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ está disponible (usted tiene la %3$@). ¿Desea descargarla ahora?"; + +"%@ downloaded" = "%@ descargado"; + +"%@ of %@" = "%1$@ de %2$@"; + +"A new version of %@ is available!" = "¡Hay una nueva versión de %@ !"; + +"A new version of %@ is ready to install!" = "¡Una versión nueva de %@ está lista para instalar!"; + +"An error occurred in retrieving update information. Please try again later." = "Ocurrió un error al recopilar información sobre la actualización. Por favor, inténtelo de nuevo más tarde."; + +"An error occurred while downloading the update. Please try again later." = "Ocurrió un error mientras se descargaba la actualización. Por favor intente de nuevo más tarde."; + +"An error occurred while extracting the archive. Please try again later." = "Ocurrió un error al extraer el archivo. Por favor, inténtelo de nuevo más tarde."; + +"An error occurred while installing the update. Please try again later." = "Ocurrió un error mientras se instalaba la actualización. Por favor intente de nuevo más tarde."; + +"An error occurred while parsing the update feed." = "Ocurrió un error mientras se analizaba la entrada de la actualización."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Ocurrió un error mientras se re-iniciaba %1$@, pero la nueva versión estará disponible la próxima vez que ejecute %1$@."; + +/* the unit for bytes */ +"B" = "O"; + +"Cancel" = "Cancelar"; + +"Cancel Update" = "Cancelar actualización"; + +"Checking for updates..." = "Buscando actualizaciones …"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Descargando actualización…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Extrayendo actualización…"; + +/* the unit for gigabytes */ +"GB" = "GO"; + +"Install and Relaunch" = "Instalar y volver a arrancar"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Instalando actualización…"; + +/* the unit for kilobytes */ +"KB" = "KO"; + +/* the unit for megabytes */ +"MB" = "MB"; + +"OK" = "OK"; + +"Ready to Install" = "Preparado para instalar"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "¿Debería automáticamente %1$@ buscar las actualizaciones? Puede hacerlo también manualmente desde el menú %1$@."; + +"Update Error!" = "¡Error de actualización!"; + +"Updating %@" = "Actualizando %@"; + +"You already have the newest version of %@." = "Ya tiene la versión más reciente de %@."; + +"You're up-to-date!" = "Ya tiene la versión más reciente"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ + +"Learn More..." = "Más información…"; diff --git a/Frameworks/Sparkle/Sparkle/fi.lproj/SUAutomaticUpdateAlert.strings b/Frameworks/Sparkle/Sparkle/fi.lproj/SUAutomaticUpdateAlert.strings new file mode 100644 index 000000000..76e07e10c --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/fi.lproj/SUAutomaticUpdateAlert.strings @@ -0,0 +1,12 @@ +/* NSWindow () : (oid:5) */ +"" = ""; + +/* NSButton (Automatically download and install updates in the future) : (oid:17) */ +"Automatically download and install updates in the future" = "Hae ja asenna päivitykset jatkossa automaattisesti"; + +/* NSButton (Relaunch Later) : (oid:16) */ +"Relaunch Later" = "Käynnistä uudelleen myöhemmin"; + +/* NSButton (Relaunch Now) : (oid:15) */ +"Relaunch Now" = "Käynnistä uudelleen nyt"; + diff --git a/Frameworks/Sparkle/Sparkle/fi.lproj/SUUpdateAlert.strings b/Frameworks/Sparkle/Sparkle/fi.lproj/SUUpdateAlert.strings new file mode 100644 index 000000000..471de4aaf --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/fi.lproj/SUUpdateAlert.strings @@ -0,0 +1,18 @@ +/* NSButton (Automatically download and install updates in the future) : (oid:92) */ +"Automatically download and install updates in the future" = "Hae ja asenna päivitykset jatkossa automaattisesti"; + +/* NSButton (Install Update) : (oid:76) */ +"Install Update" = "Asenna päivitys"; + +/* NSTextField (Release Notes:) : (oid:17) */ +"Release Notes:" = "Tietoa päivityksestä:"; + +/* NSButton (Remind Me Later) : (oid:22) */ +"Remind Me Later" = "Muistuta myöhemmin"; + +/* NSButton (Skip This Version) : (oid:23) */ +"Skip This Version" = "Ohita tämä versio"; + +/* NSWindow (Software Update) : (oid:5) */ +"Software Update" = "Ohjelmiston pävitys"; + diff --git a/Frameworks/Sparkle/Sparkle/fi.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/fi.lproj/Sparkle.strings new file mode 100644 index 000000000..f57a8b5ad --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/fi.lproj/Sparkle.strings @@ -0,0 +1,52 @@ +"%@ of %@" = "%1$@ / %2$@"; + +"%@ %@ has been installed and will be ready to use next time %@ starts! Would you like to relaunch now?" = "%1$@ %2$@ on asennettu ja on valmiina käyttöön seuraavan kerran kun %3$@ käynnistetään! Haluatko käynnistää ohjelman uudelleen?"; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ on uusin saatavilla oleva versio."; + +"%@ %@ is now available (you have %@). Would you like to download it now?" = "%1$@ %2$@ on nyt saatavilla (sinulla on %3$@). Haluatko ladata sen nyt?"; + +"%@ does not have permission to write to the application's directory! Are you running off a disk image? If not, ask your system administrator for help." = "Käyttäjällä %@ ei ole oikeuksia ohjelman kansioon! Ajatko ohjelmaa levytiedostosta? Jos et, kysy apua järjestelmän ylläpitäjältä."; + +"A new version of %@ has been installed!" = "Uusi versio ohjelmasta %@ on asennettu!"; + +"A new version of %@ is available!" = "Uusi versio ohjelmasta %@ on saatavilla!"; + +"An error occurred during installation. Please try again later." = "Asennuksen yhteydessä tapahtui virhe. Yritä myöhemmin uudelleen."; + +"An error occurred in retrieving update information. Please try again later." = "Päivitystietojen haussa tapahtui virhe. Yritä myöhemmin uudelleen."; + +"An error occurred while extracting the archive. Please try again later." = "Pakkauksen purkamisen yhteydessä tapahtui virhe. Yritä myöhemmin uudelleen."; + +"An error occurred while trying to download the file. Please try again later." = "Tiedoston haussa tapahtui virhe. Yritä myöhemmin uudelleen."; + +"An update is already in progress!" = "Päivitys on jo menossa!"; + +"Cancel" = "Kumoa"; + +"Check for updates on startup?" = "Tarkista päivityksiä käynnistyksen yhteydessä?"; + +"Downloading update..." = "Haen päivitystä…"; + +"Extracting update..." = "Puran päivitystä…"; + +"Install and Relaunch" = "Asenna ja käynnistä ohjelma uudelleen"; + +"Installing update..." = "Asennan päivityksen…"; + +"No" = "Ei"; + +"OK" = "OK"; + +"Ready to Install" = "Valmiina asentamaan"; + +"Update Error!" = "Virhe päivityksessä!"; + +"Updating %@" = "Päivitän %@"; + +"Would you like %@ to check for updates on startup? If not, you can initiate the check manually from the application menu." = "Haluatko tarkistaa päivitykset ohjelmaan %@ käynnistyksen yhteydessä? Jos et, voit käynnnistää tarkistuksen käsin ohjelmavalikosta."; + +"Yes" = "Kyllä"; + +"You're up to date!" = "Sinulla on viimeisin versio!"; + diff --git a/Frameworks/Sparkle/Sparkle/fr.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/fr.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..e479f3358 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/fr.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/fr.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/fr.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..6cee37e1c --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/fr.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/fr.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/fr.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..347ec9a85 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/fr.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Les informations anonymes de profil système nous aident à planifier les futurs développements. Contactez-nous pour toute question à ce sujet. + +Ci-dessous figurent les informations qui seront transmises : + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/fr.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/fr.lproj/Sparkle.strings new file mode 100644 index 000000000..7ab704c3a --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/fr.lproj/Sparkle.strings @@ -0,0 +1,77 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ a été téléchargé. Voulez-vous l’installer et relancer %1$@ maintenant ?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ ne peut pas être mis à jour quand il fonctionne à partir d’un volume en lecture seule, comme une image disque ou un lecteur optique. Déplacez %1$@ dans votre dossier Applications, relancez-le à partir de là et réessayez."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ est la version la plus récente disponible."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ est disponible ; vous utilisez la version %3$@. Voulez-vous le télécharger maintenant ?"; + +"%@ downloaded" = "%@ téléchargé"; + +"%@ of %@" = "%1$@ sur %2$@"; + +"A new version of %@ is available!" = "Une nouvelle version de %@ est disponible !"; + +"A new version of %@ is ready to install!" = "Une nouvelle version de %@ est prête à être installée !"; + +"An error occurred in retrieving update information. Please try again later." = "Une erreur est survenue en récupérant les informations de mise à jour. Veuillez réessayer plus tard."; + +"An error occurred while downloading the update. Please try again later." = "Une erreur est survenue pendant le téléchargement de la mise à jour. Veuillez réessayer plus tard."; + +"An error occurred while extracting the archive. Please try again later." = "Une erreur est survenue pendant l’extraction des données de l’archive. Veuillez réessayer plus tard."; + +"An error occurred while installing the update. Please try again later." = "Une erreur est survenue pendant l’installation de la mise à jour. Veuillez réessayer plus tard."; + +"An error occurred while parsing the update feed." = "Une erreur est survenue pendant l’analyse de la mise à jour."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Une erreur est survenue en relançant %1$@, mais la nouvelle version sera disponible à la prochaine ouverture de %1$@."; + +/* the unit for bytes */ +"B" = "octets"; + +"Cancel" = "Annuler"; + +"Cancel Update" = "Annuler la mise à jour"; + +"Checking for updates..." = "Recherche de mises à jour…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Téléchargement de la mise à jour…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Extraction de la mise à jour…"; + +/* the unit for gigabytes */ +"GB" = "Go"; + +"Install and Relaunch" = "Installer et relancer"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Installation de la mise à jour…"; + +/* the unit for kilobytes */ +"KB" = "ko"; + +/* the unit for megabytes */ +"MB" = "Mo"; + +"OK" = "OK"; + +"Ready to Install" = "Prêt pour l’installation"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ doit-il rechercher automatiquement les mises à jour ? La mise à jour est toujours possible manuellement depuis le menu %1$@."; + +"Update Error!" = "Erreur pendant la mise à jour !"; + +"Updating %@" = "Mise à jour de %@"; + +"You already have the newest version of %@." = "Vous possédez déjà la version la plus récente de %@."; + +"You're up-to-date!" = "Votre logiciel est à jour !"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ + +"Learn More..." = "En savoir plus…"; + +"The update is improperly signed." = "La signature numérique de la mise à jour est incorrecte"; diff --git a/Frameworks/Sparkle/Sparkle/he.lproj/SUAutomaticUpdateAlert.strings b/Frameworks/Sparkle/Sparkle/he.lproj/SUAutomaticUpdateAlert.strings new file mode 100644 index 000000000..5b3391b21 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/he.lproj/SUAutomaticUpdateAlert.strings @@ -0,0 +1,12 @@ +/* NSWindow () : (oid:5) */ +"" = ""; + +/* NSButton (Automatically download and install updates in the future) : (oid:17) */ +"Automatically download and install updates in the future" = "הורד והתקן עדכונים אוטומטית גם בעתיד"; + +/* NSButton (Relaunch Later) : (oid:16) */ +"Relaunch Later" = "אתחל מאוחר יותר"; + +/* NSButton (Relaunch Now) : (oid:15) */ +"Relaunch Now" = "אתחל עכשיו"; + diff --git a/Frameworks/Sparkle/Sparkle/he.lproj/SUUpdateAlert.strings b/Frameworks/Sparkle/Sparkle/he.lproj/SUUpdateAlert.strings new file mode 100644 index 000000000..f6debba97 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/he.lproj/SUUpdateAlert.strings @@ -0,0 +1,18 @@ +/* NSButton (Automatically download and install updates in the future) : (oid:92) */ +"Automatically download and install updates in the future" = "הורד והתקן עדכונים אוטומטית גם בעתיד"; + +/* NSButton (Install Update) : (oid:76) */ +"Install Update" = "התקן עדכון"; + +/* NSTextField (Release Notes:) : (oid:17) */ +"Release Notes:" = "פרטי גרסה:"; + +/* NSButton (Remind Me Later) : (oid:22) */ +"Remind Me Later" = "הזכר לי מאוחר יותר"; + +/* NSButton (Skip This Version) : (oid:23) */ +"Skip This Version" = "דלג על גרסה זו"; + +/* NSWindow (Software Update) : (oid:5) */ +"Software Update" = "עדכון תכנה"; + diff --git a/Frameworks/Sparkle/Sparkle/he.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/he.lproj/Sparkle.strings new file mode 100644 index 000000000..0d2aa275a --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/he.lproj/Sparkle.strings @@ -0,0 +1,52 @@ +"%@ of %@" = "%1$@ of %2$@"; + +"%@ %@ has been installed and will be ready to use next time %@ starts! Would you like to relaunch now?" = "%1$@ %2$@ הותקנה ותהיה מוכנה לפעולה בפעם הבאה שתריץ את %3$@ ! ברצונך לאתחל?"; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ היא הגרסה האחונה הזמינה."; + +"%@ %@ is now available (you have %@). Would you like to download it now?" = "%1$@ %2$@ זמין כעת (לך יש %3$@). ברצונך להוריד כעת?"; + +"%@ does not have permission to write to the application's directory! Are you running off a disk image? If not, ask your system administrator for help." = "ל %@ אין הרשאה לכתוב לתקיית התוכניות! האם אתה פועל מ- disc image? אם לא, בקש עזרה ממנהל הרשת."; + +"A new version of %@ has been installed!" = "גרסה חדשה של %@ הותקנה!"; + +"A new version of %@ is available!" = "גרסה חדשה של %@ זמינה!"; + +"An error occurred during installation. Please try again later." = "שגיאה בהתקנה. אנא נסה שנית במועד מרוחר יותר."; + +"An error occurred in retrieving update information. Please try again later." = "שגיאה בקבלת מידע על עדכונים. אנא נסה שנית במועד מרוחר יותר."; + +"An error occurred while extracting the archive. Please try again later." = "שגיאה בפתיחת הקובת המקווץ. אנא נסה שנית במועד מרוחר יותר."; + +"An error occurred while trying to download the file. Please try again later." = "שגיאה בהורדת הקובץ. אנא נסה שנית במועד מאוחר יותר."; + +"An update is already in progress!" = "עדכון כבר מתבצע"; + +"Cancel" = "ביטול"; + +"Check for updates on startup?" = "לבדוק עדכונים באתחול?"; + +"Downloading update..." = "מוריד עדכון…"; + +"Extracting update..." = "פותח עדכון…"; + +"Install and Relaunch" = "התקן ואתחל"; + +"Installing update..." = "מתקין עידכון…"; + +"No" = "לא"; + +"OK" = "אישור"; + +"Ready to Install" = "מוכן להתקנה!"; + +"Update Error!" = "שגיאה בעדכון!"; + +"Updating %@" = "מעדכן %@"; + +"Would you like %@ to check for updates on startup? If not, you can initiate the check manually from the application menu." = "האם ברצונך ש%@ יבדוק עדכונים באתחול? אם לא, תוכל לבדוק ידנית מתפריט התכנה."; + +"Yes" = "כן"; + +"You're up to date!" = "התכנה עדכנית!"; + diff --git a/Frameworks/Sparkle/Sparkle/hu.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/hu.lproj/Sparkle.strings new file mode 100644 index 000000000..a9b47b259 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/hu.lproj/Sparkle.strings @@ -0,0 +1,52 @@ +"%@ of %@" = "%1$@ of %2$@"; + +"%@ %@ has been installed and will be ready to use next time %@ starts! Would you like to relaunch now?" = "%1$@ %2$@ has been installed and will be ready to use next time %3$@ starts! Would you like to relaunch now?"; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ is currently the newest version available."; + +"%@ %@ is now available (you have %@). Would you like to download it now?" = "%1$@ %2$@ is now available (you have %3$@). Would you like to download it now?"; + +"%@ does not have permission to write to the application's directory! Are you running off a disk image? If not, ask your system administrator for help." = "%@ does not have permission to write to the application's directory! Are you running off a disk image? If not, ask your system administrator for help."; + +"A new version of %@ has been installed!" = "A new version of %@ has been installed!"; + +"A new version of %@ is available!" = "A new version of %@ is available!"; + +"An error occurred during installation. Please try again later." = "An error occurred during installation. Please try again later."; + +"An error occurred in retrieving update information. Please try again later." = "An error occurred in retrieving update information. Please try again later."; + +"An error occurred while extracting the archive. Please try again later." = "An error occurred while extracting the archive. Please try again later."; + +"An error occurred while trying to download the file. Please try again later." = "An error occurred while trying to download the file. Please try again later."; + +"An update is already in progress!" = "An update is already in progress!"; + +"Cancel" = "Cancel"; + +"Check for updates on startup?" = "Check for updates on startup?"; + +"Downloading update..." = "Downloading update…"; + +"Extracting update..." = "Extracting update…"; + +"Install and Relaunch" = "Install and Relaunch"; + +"Installing update..." = "Installing update…"; + +"No" = "No"; + +"OK" = "OK"; + +"Ready to Install" = "Ready to Install"; + +"Update Error!" = "Update Error!"; + +"Updating %@" = "Updating %@"; + +"Would you like %@ to check for updates on startup? If not, you can initiate the check manually from the application menu." = "Would you like %@ to check for updates on startup? If not, you can initiate the check manually from the application menu."; + +"Yes" = "Yes"; + +"You're up to date!" = "You're up to date!"; + diff --git a/Frameworks/Sparkle/Sparkle/id.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/id.lproj/Sparkle.strings new file mode 100644 index 000000000..a9b47b259 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/id.lproj/Sparkle.strings @@ -0,0 +1,52 @@ +"%@ of %@" = "%1$@ of %2$@"; + +"%@ %@ has been installed and will be ready to use next time %@ starts! Would you like to relaunch now?" = "%1$@ %2$@ has been installed and will be ready to use next time %3$@ starts! Would you like to relaunch now?"; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ is currently the newest version available."; + +"%@ %@ is now available (you have %@). Would you like to download it now?" = "%1$@ %2$@ is now available (you have %3$@). Would you like to download it now?"; + +"%@ does not have permission to write to the application's directory! Are you running off a disk image? If not, ask your system administrator for help." = "%@ does not have permission to write to the application's directory! Are you running off a disk image? If not, ask your system administrator for help."; + +"A new version of %@ has been installed!" = "A new version of %@ has been installed!"; + +"A new version of %@ is available!" = "A new version of %@ is available!"; + +"An error occurred during installation. Please try again later." = "An error occurred during installation. Please try again later."; + +"An error occurred in retrieving update information. Please try again later." = "An error occurred in retrieving update information. Please try again later."; + +"An error occurred while extracting the archive. Please try again later." = "An error occurred while extracting the archive. Please try again later."; + +"An error occurred while trying to download the file. Please try again later." = "An error occurred while trying to download the file. Please try again later."; + +"An update is already in progress!" = "An update is already in progress!"; + +"Cancel" = "Cancel"; + +"Check for updates on startup?" = "Check for updates on startup?"; + +"Downloading update..." = "Downloading update…"; + +"Extracting update..." = "Extracting update…"; + +"Install and Relaunch" = "Install and Relaunch"; + +"Installing update..." = "Installing update…"; + +"No" = "No"; + +"OK" = "OK"; + +"Ready to Install" = "Ready to Install"; + +"Update Error!" = "Update Error!"; + +"Updating %@" = "Updating %@"; + +"Would you like %@ to check for updates on startup? If not, you can initiate the check manually from the application menu." = "Would you like %@ to check for updates on startup? If not, you can initiate the check manually from the application menu."; + +"Yes" = "Yes"; + +"You're up to date!" = "You're up to date!"; + diff --git a/Frameworks/Sparkle/Sparkle/is.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/is.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..1e8542ec9 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/is.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/is.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/is.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..6dba3438f --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/is.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/is.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/is.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..af4e9524e --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/is.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Upplýsingar úr nafnlausum kerfisskýrslum eru notaðar til að hjálpa okkur við framtíðarþróun hugbúnaðarins. Ekki hika við að hafa samband ef spurningar vakna um þetta. + +Þetta eru upplýsingarnar sem yrðu sendar: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/is.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/is.lproj/Sparkle.strings new file mode 100644 index 000000000..da6f2c63a --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/is.lproj/Sparkle.strings @@ -0,0 +1,52 @@ +"%@ of %@" = "%@ af %@"; + +"%@ %@ has been installed and will be ready to use next time %@ starts! Would you like to relaunch now?" = "%@ %@ hefur verið sett inn og verður tiltækt við næstu ræsingu %@. Viltu endurræsa núna?"; + +"%@ %@ is currently the newest version available." = "%@ %@ er nýjasta útgáfan sem er fáanleg þessa stundina."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "Útgafa %2$@ af %1$@ er nú fáanlegt en þú ert með %3$@. Viltu sækja hana núna?"; + +"%@ does not have permission to write to the application's directory! Are you running off a disk image? If not, ask your system administrator for help." = "%@ hefur ekki heimild til að skrifa í möppu forritsins! Ertu að keyra forritið af diskmynd? Ef ekki skaltu ráðfæra þig við kerfisstjórann."; + +"A new version of %@ has been installed!" = "Ný útgáfa af %@ hefur verið sett inn!"; + +"A new version of %@ is available!" = "Ný útgáfa af %@ er fáanleg!"; + +"An error occurred during installation. Please try again later." = "Villa kom upp við innsetningu. Vinsamlegast reynið síðar."; + +"An error occurred in retrieving update information. Please try again later." = "Villa kom upp við að sækja uppfærsluupplýsingar. Vinsamlegast reynið síðar."; + +"An error occurred while extracting the archive. Please try again later." = "Villa kom upp við afþjöppun skráarsafns. Vinsamlegast reynið síðar."; + +"An error occurred while trying to download the file. Please try again later." = "Villa kom upp þegar reynt var að sækja skrána. Vinsamlegast reynið síðar"; + +"An update is already in progress!" = "Uppfærsla er þegar í gangi!"; + +"Cancel" = "Hætta við"; + +"Check for updates on startup?" = "Athuga með uppfærslur í ræsingu?"; + +"Downloading update..." = "Sækja nýja útgáfu…"; + +"Extracting update..." = "Afþjappa uppfærslu…"; + +"Install and Relaunch" = "Setja upp og ræsa aftur"; + +"Installing update..." = "Set inn uppfærslu…"; + +"Ready to Install" = "Innsetning reiðubúin"; + +"No" = "Nei"; + +"OK" = "Í lagi"; + +"Update Error!" = "Villa við uppfærslu!"; + +"Updating %@" = "Uppfæri %@"; + +"Would you like %@ to check for updates on startup? If not, you can initiate the check manually from the %@ menu." = "Viltu að forritið %@ athugi með uppfærslur þegar það er ræst? Ef ekki getur þú athugað handvirkt af %@-valblaðinu."; + +"Yes" = "Já"; + +"You're up to date!" = "Það er allt uppfært hjá þér!"; + diff --git a/Frameworks/Sparkle/Sparkle/it.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/it.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..30f0c8660 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/it.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/it.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/it.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..79b06d5bc --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/it.lproj/SUUpdateAlert.xib @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/it.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/it.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..582aa13c7 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/it.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Le informazioni del profilo di sistema anomino sono utilizzate per aiutarci in futuri lavori di sviluppo. Contattaci se hai dei quesiti sull’argomento. + +Queste sono le informazioni che verrebbero inviate: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/it.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/it.lproj/Sparkle.strings new file mode 100644 index 000000000..096e6caab --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/it.lproj/Sparkle.strings @@ -0,0 +1,75 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ è stato scaricato ed è pronto per essere utilizzato! Desideri installare e riavviare %1$@ ora?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "Impossibile aggiornare %1$@ quando viene eseguito da un volume di sola lettura come un’immagine disco o un’unità ottica. Spostare %1$@ nella Cartella Applicazioni, riavviarlo e riprovare."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ è la versione più recente attualmente disponibile."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ è disponbile; disponi della versione %3$@. Desideri eseguire l’aggiornamento ora?"; + +"%@ downloaded" = "%@ scaricato"; + +"%@ of %@" = "%1$@ di %2$@"; + +"A new version of %@ is available!" = "E’ disponibile una nuova versione di %@!"; + +"A new version of %@ is ready to install!" = "Una nuova versione di %@ è pronta per essere installata!"; + +"An error occurred in retrieving update information. Please try again later." = "Si è verificato un errore durante il recupero delle informazioni sull’aggiornamento. Riprova in seguito."; + +"An error occurred while downloading the update. Please try again later." = "Si è verificato un errore durante lo scaricamento dell’aggiornamento. Riprova in seguito."; + +"An error occurred while extracting the archive. Please try again later." = "Si è verificato un errore durante l’estrazione dell’archivio. Riprova in seguito."; + +"An error occurred while installing the update. Please try again later." = "Si è verificato un errore durante l’installazione dell’aggiornamento. Riprova in seguito."; + +"An error occurred while parsing the update feed." = "Si è verificato un errore durante la lettura del feed di aggiornamento."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Si è verificato un errore al riavvio di %1$@. La nuova versione sarà comunque disponibile alla prossima esecuzione di %1$@."; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Annulla"; + +"Cancel Update" = "Annulla Aggiornamento"; + +"Checking for updates..." = "Controllo aggiornamenti in corso…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Scaricamento dell’aggiornamento…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Estrazione dell’aggiornamento…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Installa e Riavvia"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Installazione aggiornamento in corso…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +"OK" = "OK"; + +"Ready to Install" = "Pronto per l’installazione"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Desideri che %1$@ verifichi gli aggiornamenti automaticamente? Puoi effettuare la verifica manualmente dal menu di %1$@."; + +"Update Error!" = "Errore di Aggiornamento!"; + +"Updating %@" = "Aggiornamento di %@"; + +"You already have the newest version of %@." = "Disponi della versione più recente di %@."; + +"You're up-to-date!" = "La tua applicazione è aggiornata!"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ + +"Learn More..." = "Ulteriori informazioni…"; diff --git a/Frameworks/Sparkle/Sparkle/ja.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/ja.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..b9afe24a4 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ja.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ja.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/ja.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..675fd050b --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ja.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ja.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/ja.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..0648c96b9 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ja.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + 匿名のシステムプロファイル情報は、今後我が社の企画開発を計画する上で参考にさせていただきます。この件に関してご質問があれば、ご連絡下さい。 + +以下の情報を送信してください： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ja.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/ja.lproj/Sparkle.strings new file mode 100644 index 000000000..dfe98beed --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ja.lproj/Sparkle.strings @@ -0,0 +1,85 @@ +"%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$@ をインストールして再起動しますか？"; + +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ がダウンロードされました! 今すぐ %1$@ をインストールして再起動しますか？"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ は、ディスクイメージや光学式ドライブなどの読み出し専用ボリュームから起動している場合アップデートできません。%1$@ をアプリケーションフォルダに移動し、そこから再起動したあとやり直してください。"; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ は現在入手できる最新バージョンです。"; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ が入手できます（使用中のバージョンは %3$@ です）。今すぐダウンロードしますか？"; + +"%@ downloaded" = "%@ ダウンロード済み"; + +"%@ of %@" = "%1$@ / %2$@"; + +"A new version of %@ is available!" = "新しいバージョンの %@ が入手できます！"; + +"A new version of %@ is ready to install!" = "新しいバージョンの %@ が今すぐインストールできます！"; + +"An error occurred in retrieving update information. Please try again later." = "アップデート情報の取得中にエラーが発生しました。あとでやり直してください。"; + +"An error occurred while downloading the update. Please try again later." = "アップデートをダウンロード中にエラーが発生しました。あとでやり直してください。"; + +"An error occurred while extracting the archive. Please try again later." = "アーカイブの展開中にエラーが発生しました。あとでやり直してください。"; + +"An error occurred while installing the update. Please try again later." = "アップデートをインストール中にエラーが発生しました。あとでやり直してください。"; + +"An error occurred while parsing the update feed." = "アップデートフィードを解析中にエラーが発生しました。"; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "%1$@ を再起動中にエラーが発生しましたが、次回 %1$@ の実行時に新しいバージョンが利用できます。"; + +"An important update to %@ is ready to install" = "%@ の重要なアップデートがインストールできます。"; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "キャンセル"; + +"Cancel Update" = "アップデートを中止"; + +"Checking for updates..." = "アップデートを確認しています…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "アップデートをダウンロードしています…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "アップデートを展開しています…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "インストールして再起動"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "アップデートをインストールしています…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ +"Learn More..." = "詳しい情報…"; + +/* the unit for megabytes */ +"MB" = "MB"; + +/* OK button. */ +"OK" = "OK"; + +/* Status message on progress window once download has finished. */ +"Ready to Install" = "インストールできます"; + +/* Message that is optionally shown at startup to allow users to turn on/off update checks. */ +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = " %1$@ のアップデートを自動で確認しますか？ アップデートは %1$@ メニューから手動でいつでも確認することができます。"; + +"The update is improperly signed." = "このアップデートは無効な署名が含まれています。"; + +"Update Error!" = "アップデートエラー！"; + +"Updating %@" = "%@ をアップデート中"; + +/* 'Error' message when the user checks for updates but is already current or the feed doesn't contain any updates. (not necessarily shown in UI) */ +"You already have the newest version of %@." = "すでに最新バージョンの %@ を使用しています。"; + +/* 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!" = "最新版を使用しています！"; diff --git a/Frameworks/Sparkle/Sparkle/ko.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/ko.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..8797c38ab --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ko.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ko.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/ko.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..4cddbc2a9 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ko.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ko.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/ko.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..9c8d5110f --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ko.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + 익명으로 보내지는 시스템 정보로 차후 프로그램 개발에 도움이 될 수 있습니다. 질문이 있으시면 연락 주십시오. + +아래 정보가 전송될 것입니다. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ko.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/ko.lproj/Sparkle.strings new file mode 100644 index 000000000..50a939979 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ko.lproj/Sparkle.strings @@ -0,0 +1,71 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@이(가) 다운로드 되었습니다. 프로그램을 업데이트하고 재실행 하시겠습니까?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@이(가) 디스크 이미지나 CD 드라이브 같은 읽기 전용 볼륨에서 실행되고 있으므로 업데이트 할 수 없습니다. %1$@을(를) 응용프로그램 폴더로 이동하여 다시 실행해 주십시오."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@이(가) 현재 최신 버전입니다."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@이(가) 업데이트 되었습니다. (현재 버전 : %3$@) 다운로드 하시겠습니까?"; + +"%@ downloaded" = "%@ 다운로드 완료"; + +"%@ of %@" = "%1$@ / %2$@"; + +"A new version of %@ is available!" = "%@ 새 버전이 있습니다."; + +"A new version of %@ is ready to install!" = "%@ 새 버전을 설치할 준비가 되었습니다."; + +"An error occurred in retrieving update information. Please try again later." = "업데이트 정보를 수집하는 중 오류가 발생하였습니다. 나중에 다시 시도해 주십시오."; + +"An error occurred while downloading the update. Please try again later." = "업데이트를 다운로드 하는 중 오류가 발생하였습니다. 나중에 다시 시도해 주십시오."; + +"An error occurred while extracting the archive. Please try again later." = "압축 파일을 푸는 중 오류가 발생하였습니다. 나중에 다시 시도해 주십시오."; + +"An error occurred while installing the update. Please try again later." = "업데이트를 설치하는 중 오류가 발생하였습니다. 나중에 다시 시도해 주십시오."; + +"An error occurred while parsing the update feed." = "업데이트 피드를 분석하는 중 오류가 발생하였습니다."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "%1$@을(를) 재실행하는 중 오류가 발생하였습니다. 업데이트는 완료되었으므로 다음 실행시에는 새 버전으로 실행됩니다."; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "취소"; + +"Cancel Update" = "업데이트 취소"; + +"Checking for updates..." = "업데이트 확인 중…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "다운로드 중…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "압축 푸는 중…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "설치 & 재실행"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "설치 중…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +"OK" = "확인"; + +"Ready to Install" = "설치 준비 완료"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ 업데이트 확인을 자동으로 할까요? %1$@ 메뉴에서 수동 설정을 할 수 있습니다."; + +"Update Error!" = "업데이트 오류!"; + +"Updating %@" = "%@ 업데이트 중"; + +"You already have the newest version of %@." = "이미 %@ 최신 버전입니다."; + +"You're up to date!" = "최신 버전입니다."; + diff --git a/Frameworks/Sparkle/Sparkle/nb.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/nb.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..aa23477ef --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/nb.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/nb.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/nb.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..46dc0feb6 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/nb.lproj/SUUpdateAlert.xib @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/nb.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/nb.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..54c7c1ac8 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/nb.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Den anonyme systemprofilen hjelper oss med å planlegge fremtidig utviklingsarbeid. Ta gjerne kontakt med oss hvis du har spørsmål om dette.
 +Følgende innhold vil bli sendt: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/nb.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/nb.lproj/Sparkle.strings new file mode 100644 index 000000000..db8a6c36b --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/nb.lproj/Sparkle.strings @@ -0,0 +1,84 @@ +"%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 lastet ned og er klar til bruk! Dette er en viktig oppdatering; ønsker du å installere og restarte %1$@ nå?"; + +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ er lastet ned og er klar til bruk! Ønsker du å installere og restarte %1$@ nå?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ kan ikke oppdateres fra en 'bare lesbar' enhet som f.eks. en cd. Flytt %1$@ til Programmer-katalogen, start på ny og prøv igjen."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ er nyeste versjon."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ er nå tilgjengelig—du har %3$@. Ønsker du å laste ned og installere nå?"; + +"%@ downloaded" = "%@ lastet ned"; + +"%@ of %@" = "%1$@ av %2$@"; + +"A new version of %@ is available!" = "En ny versjon av %@ er tilgjengelig!"; + +"A new version of %@ is ready to install!" = "En ny versjon av %@ er klar for installering!"; + +"An error occurred in retrieving update information. Please try again later." = "En feil oppstod ved henting av oppdateringsinformasjon. Vennligst prøv igjen senere."; + +"An error occurred while downloading the update. Please try again later." = "En feil oppstod under nedlasting av oppdateringen. Vennligst prøv igjen senere."; + +"An error occurred while extracting the archive. Please try again later." = "En feil oppstod under utpakking av oppdateringen. Vennligst prøv igjen senere."; + +"An error occurred while installing the update. Please try again later." = "En feil oppstod under installering av opddateringen. Vennligst prøv igjen senere."; + +"An error occurred while parsing the update feed." = "En feil oppstod under lesing av oppdateringsstrømmen."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "En feil oppstod under omstart av %1$@, men den nyeste versjonen vil være tilgjengelig neste gang du starter %1$@."; + +"An important update to %@ is ready to install" = "En viktig oppdatering for %@ er klar til å installeres"; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Avbryt"; + +"Cancel Update" = "Avbryt oppdateringen"; + +"Checking for updates..." = "Søker etter oppdateringer…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Laster ned oppdateringen…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Pakker ut oppdateringen…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Installer og start på ny"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Installerer oppdateringen…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +/* OK button. */ +"OK" = "OK"; + +/* Status message on progress window once download has finished. */ +"Ready to Install" = "Klar til å installere"; + +/* Message that is optionally shown at startup to allow users to turn on/off update checks. */ +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Skal %1$@ søke automatisk etter oppdateringer? Du kan når som helst søke manuelt fra %1$@-menyen."; + +"Update Error!" = "Feil ved oppdateringen!"; + +"Updating %@" = "Oppdaterer %@"; + +/* 'Error' message when the user checks for updates but is already current or the feed doesn't contain any updates. (not necessarily shown in UI) */ +"You already have the newest version of %@." = "Du har allerede nyeste versjon av %@."; + +/* 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!" = "Ingen nye oppdateringer"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ +"Learn More..." = "Mer info…"; + diff --git a/Frameworks/Sparkle/Sparkle/nl.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/nl.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..cc4b4589b --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/nl.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/nl.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/nl.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..b730298f3 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/nl.lproj/SUUpdateAlert.xib @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/nl.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/nl.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..a8585c6a8 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/nl.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Aan de hand van anonieme informatie over het systeemprofiel kunnen wij toekomstige ontwikkelingswerkzaamheden beter plannen. Neem contact met ons op als u hierover vragen hebt. + +Dit is de informatie die wordt verzonden: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/nl.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/nl.lproj/Sparkle.strings new file mode 100644 index 000000000..ffa3f0b8c --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/nl.lproj/Sparkle.strings @@ -0,0 +1,80 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ is gedownload en is klaar voor gebruik! Wilt u %1$@ nu installeren en herstarten?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ kan niet worden geupdate als het van een alleen-lezen volume, zoals een schijfkopie of CD, geopend is. Verplaats %1$@ naar de Map ’Programma’s’, herstart van daar, en probeer opnieuw."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ is momenteel de recentste versie."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ is nu beschikbaar—u heeft %3$@. Wilt u het nu downloaden?"; + +"%@ downloaded" = "%@ gedownload"; + +"%@ of %@" = "%1$@ van %2$@"; + +"A new version of %@ is available!" = "Een nieuwe versie van %@ is beschikbaar!"; + +"A new version of %@ is ready to install!" = "Een nieuwe versie van %@ is klaar om te installeren!"; + +"An error occurred in retrieving update information. Please try again later." = "Bij het ophalen van update-informatie deed zich een fout voor. Probeer alstublieft later opnieuw."; + +"An error occurred while downloading the update. Please try again later." = "Bij het downloaden deed zich een fout voor. Probeer alstublieft later opnieuw."; + +"An error occurred while extracting the archive. Please try again later." = "Bij het uitpakken van het archief deed zich een fout voor. Probeer alstublieft later opnieuw."; + +"An error occurred while installing the update. Please try again later." = "Bij het installeren van de update deed zich een fout voor. Probeer alstublieft later opnieuw."; + +"An error occurred while parsing the update feed." = "Bij het afhandelen van de update feed deed zich een fout voor."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Bij het herstarten van %1$@ deed zich een fout voor. Maar de nieuwe versie is beschikbaar de volgende keer u %1$@ opstart."; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Annuleren"; + +"Cancel Update" = "Updaten annuleren"; + +"Checking for updates..." = "Controleren op updates …"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Downloaden update …"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Bezig met uitpakken van de update …"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Installeer en herstart"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Update installeren …"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +/* OK button. */ +"OK" = "OK"; + +/* Status message on progress window once download has finished. */ +"Ready to Install" = "Klaar om te installeren"; + +/* Message that is optionally shown at startup to allow users to turn on/off update checks. */ +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Zou %1$@ automatisch op updates moeten controleren? U kunt altijd nog handmatig controleren op updates via het %1$@ menu."; + +"Update Error!" = "Update-fout!"; + +"Updating %@" = "%@ updaten"; + +/* 'Error' message when the user checks for updates but is already current or the feed doesn't contain any updates. (not necessarily shown in UI) */ +"You already have the newest version of %@." = "U heeft al de nieuwste versie van %@."; + +/* 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!" = "U heeft de nieuwste versie!"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ + +"Learn More..." = "Meer informatie …"; diff --git a/Frameworks/Sparkle/Sparkle/no.lproj/SUAutomaticUpdateAlert.strings b/Frameworks/Sparkle/Sparkle/no.lproj/SUAutomaticUpdateAlert.strings new file mode 100644 index 000000000..56e7c6619 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/no.lproj/SUAutomaticUpdateAlert.strings @@ -0,0 +1,12 @@ +/* NSWindow () : (oid:5) */ +"" = ""; + +/* NSButton (Automatically download and install updates in the future) : (oid:17) */ +"Automatically download and install updates in the future" = "Last ned og installer oppdateringer automatisk i fremtiden"; + +/* NSButton (Relaunch Later) : (oid:16) */ +"Relaunch Later" = "Omstart senere"; + +/* NSButton (Relaunch Now) : (oid:15) */ +"Relaunch Now" = "Omstart nå"; + diff --git a/Frameworks/Sparkle/Sparkle/no.lproj/SUUpdateAlert.strings b/Frameworks/Sparkle/Sparkle/no.lproj/SUUpdateAlert.strings new file mode 100644 index 000000000..0b412a5c7 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/no.lproj/SUUpdateAlert.strings @@ -0,0 +1,18 @@ +/* NSButton (Automatically download and install updates in the future) : (oid:92) */ +"Automatically download and install updates in the future" = "Automatisk nedlastning og installering i fremtiden"; + +/* NSButton (Install Update) : (oid:76) */ +"Install Update" = "Installer oppdatering"; + +/* NSTextField (Release Notes:) : (oid:17) */ +"Release Notes:" = "Vedrørende utgivelsen:"; + +/* NSButton (Remind Me Later) : (oid:22) */ +"Remind Me Later" = "Påminn meg senere"; + +/* NSButton (Skip This Version) : (oid:23) */ +"Skip This Version" = "Hopp over denne versjonen"; + +/* NSWindow (Software Update) : (oid:5) */ +"Software Update" = "Programvareoppdatering"; + diff --git a/Frameworks/Sparkle/Sparkle/no.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/no.lproj/Sparkle.strings new file mode 100644 index 000000000..866607cb1 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/no.lproj/Sparkle.strings @@ -0,0 +1,52 @@ +"%@ of %@" = "%1$@ of %2$@"; + +"%@ %@ has been installed and will be ready to use next time %@ starts! Would you like to relaunch now?" = "%1$@ %2$@ har blitt installert og er klar til bruk neste gang %3$@ starter opp! Vil du starte på nytt nå?"; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ er den nyeste tilgjengelige versjonen."; + +"%@ %@ is now available (you have %@). Would you like to download it now?" = "%1$@ %2$@ er nå tilgjengelig (du har %3$@). Ønsker du å laste den ned nå?"; + +"%@ does not have permission to write to the application's directory! Are you running off a disk image? If not, ask your system administrator for help." = "%@ har ikke tilgangsrettigheter til å skrive til programmets filbane! Starter du fra en diskfil? Hvis ikke, spør din systemadministrator om hjelp."; + +"A new version of %@ has been installed!" = "En ny versjon av %@ har blitt installert!"; + +"A new version of %@ is available!" = "En ny versjon av %@ er tilgjengelig!"; + +"An error occurred during installation. Please try again later." = "Det skjedde en feil under installasjonen. Vennligst prøv igjen senere."; + +"An error occurred in retrieving update information. Please try again later." = "Det skjedde en feil ved henting av oppdateringsinformasjon. Vennligst prøv igjen senere."; + +"An error occurred while extracting the archive. Please try again later." = "Det skjedde en feil ved utpakking av filarkivet. Vennligst prøv igjen senere."; + +"An error occurred while trying to download the file. Please try again later." = "Det skjedde en feil under forsøket på å laste ned filen. Vennligst prøv igjen senere."; + +"An update is already in progress!" = "Oppdateringen er allerede igang!"; + +"Cancel" = "Avbryt"; + +"Check for updates on startup?" = "Vil du se etter oppdateringer ved oppstart?"; + +"Downloading update..." = "Laster ned oppdatering..."; + +"Extracting update..." = "Pakker ut oppdatering..."; + +"Install and Relaunch" = "Installer og start på nytt"; + +"Installing update..." = "Installerer oppdatering..."; + +"No" = "Nei"; + +"OK" = "OK"; + +"Ready to Install" = "Klar til å installere"; + +"Update Error!" = "Oppdateringsfeil!"; + +"Updating %@" = "Oppdaterer %@"; + +"Would you like %@ to check for updates on startup? If not, you can initiate the check manually from the application menu." = "Ønsker du at %@ skal se etter oppdateringer under oppstart? Hvis ikke kan du sette igang sjekkingen manuelt ifra programmenyen."; + +"Yes" = "Ja"; + +"You're up to date!" = "Du er oppdatert!"; + diff --git a/Frameworks/Sparkle/Sparkle/pl.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/pl.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..aa9cdc29b --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/pl.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/pl.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/pl.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..5836777de --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/pl.lproj/SUUpdateAlert.xib @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/pl.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/pl.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..667e888cf --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/pl.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this. + +This is the information that would be sent: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/pl.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/pl.lproj/Sparkle.strings new file mode 100644 index 000000000..e8bc35c2c --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/pl.lproj/Sparkle.strings @@ -0,0 +1,73 @@ +/* "%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?"; */ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ został pobrany i jest gotowy do użycia! Czy chciałbyś teraz zainstalować i ponownie uruchomić %1$@?"; + +/* "%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again."; */ +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ nie może zostać zaktualizowany gdy jest uruchomiony z woluminu tylko do odczytu w stylu obraz dysku lub napęd optyczny. Przenieś %1$@ do teczki Programy, uruchom z nowej lokalizacji i spróbuj ponownie."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ jest najbardziej aktualną dostępną wersją."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ jest już dostępny (aktualnie posiadasz %3$@). Chciałbyś go teraz pobrać?"; + +"%@ downloaded" = "Pobrano %@"; + +"%@ of %@" = "%1$@ z %2$@"; + +"A new version of %@ is available!" = "Dostępna jest nowa wersja %@!"; + +"A new version of %@ is ready to install!" = "Nowa wersja %@ gotowa do zainstalowania!"; + +"An error occurred in retrieving update information. Please try again later." = "Błąd podczas pobierania informacji o uaktualnieniach. Spróbuj ponownie później."; + +"An error occurred while downloading the update. Please try again later." = "Błąd podczas pobierania uaktualnienia. Spróbuj ponownie później."; + +"An error occurred while extracting the archive. Please try again later." = "Błąd podczas rozpakowywania archiwum. Spróbuj ponownie później"; + +"An error occurred while installing the update. Please try again later." = "Błąd podczas instalowania uaktualnienia. Spróbuj ponownie później"; + +"An error occurred while parsing the update feed." = "Błąd podczas analizowania danych o uaktualnieniu."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Błąd podczas ponownego uruchomienia %1$@, ale nowa wersja będzie dostępna przy ponownym ręcznym uruchomieniu %1$@."; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Anuluj"; + +"Cancel Update" = "Anuluj uaktualnianie"; + +"Checking for updates..." = "Sprawdzam uaktualnienia…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Pobieram uaktualnienia…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Rozpakowuję uaktualnienia…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Zainstaluj i uruchom ponownie"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Instalowanie uaktualnienia…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +"OK" = "OK"; + +"Ready to Install" = "Gotowy do instalacji"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Czy %1$@ powinien automatycznie sprawdzać uaktualnienia? Zawsze możesz to samemu sprawdzić z menu %1$@."; + +"Update Error!" = "Błąd uaktualniania!"; + +"Updating %@" = "Uaktualniam %@"; + +"You already have the newest version of %@." = "Posiadasz najnowszą wersję %@."; + +"You're up to date!" = "Jesteś na bieżąco!"; + diff --git a/Frameworks/Sparkle/Sparkle/pt_BR.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/pt_BR.lproj/SUAutomaticUpdateAlert.xib new file mode 100755 index 000000000..3660b403b --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/pt_BR.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/pt_BR.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/pt_BR.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..2031b20f4 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/pt_BR.lproj/SUUpdateAlert.xib @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/pt_BR.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/pt_BR.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..5ab699bb7 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/pt_BR.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Informações anônimas do sistema são utilizadas para nos ajudar a planejar o desenvolvimento futuro do aplicativo. Caso você tenha dúvidas sobre esse procedimento, por favor contate-nos. + +A seguinte informação seria enviada: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/pt_BR.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/pt_BR.lproj/Sparkle.strings new file mode 100755 index 000000000..a8c80f4b5 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/pt_BR.lproj/Sparkle.strings @@ -0,0 +1,71 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ foi baixado e está pronto para uso! Gostaria de instalar e reiniciar o %1$@ agora?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ não pode ser atualizado enquanto for executado a partir de um volume somente de leitura, como uma imagem de disco ou CD/DVD. Mova %1$@ para a pasta Aplicativos, reinicie-o e tente novamente."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ é a versão mais recente disponível."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ está disponível--sua versão é %3$@. Gostaria de baixá-lo agora?"; + +"%@ downloaded" = "%@ baixado"; + +"%@ of %@" = "%1$@ de %2$@"; + +"A new version of %@ is available!" = "Uma nova versão do %@ está disponível!"; + +"A new version of %@ is ready to install!" = "Uma nova versão do %@ está pronta para ser instalada!"; + +"An error occurred in retrieving update information. Please try again later." = "Ocorreu um erro ao buscar atualizações. Tente novamente mais tarde."; + +"An error occurred while downloading the update. Please try again later." = "Ocorreu um erro ao baixar a atualização. Tente novamente mais tarde."; + +"An error occurred while extracting the archive. Please try again later." = "Ocorreu um erro ao extrair o arquivo. Tente novamente mais tarde."; + +"An error occurred while installing the update. Please try again later." = "Ocorreu um erro ao instalar a atualização. Tente novamente mais tarde."; + +"An error occurred while parsing the update feed." = "Ocorreu um erro ao analisar a fonte de atualização."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Ocorreu um erro ao reiniciar o %1$@. A nova versão estará disponível da próxima vez que você abrir o %1$@."; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Cancelar"; + +"Cancel Update" = "Cancelar Atualização"; + +"Checking for updates..." = "Buscando atualizações…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Baixando atualização…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Extraindo atualização…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Instalar e Reiniciar"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Instalando atualização…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +"OK" = "OK"; + +"Ready to Install" = "Pronto para Instalar"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Gostaria que %1$@ buscasse atualizações automaticamente? Você pode buscar por atualizações manualmente, através do menu %1$@."; + +"Update Error!" = "Erro na Atualização!"; + +"Updating %@" = "Atualizando %@"; + +"You already have the newest version of %@." = "Você já possui a versão mais recente do %@."; + +"You're up to date!" = "Você está atualizado!"; + diff --git a/Frameworks/Sparkle/Sparkle/pt_PT.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/pt_PT.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..3aa21b7d7 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/pt_PT.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/pt_PT.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/pt_PT.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..865cdbf17 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/pt_PT.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/pt_PT.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/pt_PT.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..258fed2f6 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/pt_PT.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + A informação anónima do perfil de sistema é usada para no futuro nos ajudar a planear o trabalho de desenvolvimento. Por favor contacte-nos se tiver alguma questão acerca deste assunto. + +Esta é a informação que seria enviada: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/pt_PT.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/pt_PT.lproj/Sparkle.strings new file mode 100644 index 000000000..725628cd7 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/pt_PT.lproj/Sparkle.strings @@ -0,0 +1,71 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "O %1$@ %2$@ foi transferido e está pronto a instalar! Gostaria de o fazer agora e reiniciar o %1$@ posteriormente?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "O %1$@ não pode ser actualizado quando estiver a ser executado a partir de um volume apenas de leitura como uma imagem de disco ou disco óptico. Mova o %1$@ para a sua pasta Aplicações, reinicie-o aí e tente novamente."; + +"%@ %@ is currently the newest version available." = "O %1$@ %2$@ é neste momento a versão mais recente disponível."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "O %1$@ %2$@ está agora disponível e tem a versão %3$@. Gostaria de o transferir agora?"; + +"%@ downloaded" = "%@ transferido"; + +"%@ of %@" = "%1$@ de %2$@"; + +"A new version of %@ is available!" = "Uma nova versão do %@ está dísponível!"; + +"A new version of %@ is ready to install!" = "Uma nova versão do %@ está pronta a instalar!"; + +"An error occurred in retrieving update information. Please try again later." = "Ocorreu um erro ao recolher informação sobre as actualizações disponíveis. Por favor tente novamente mais tarde."; + +"An error occurred while downloading the update. Please try again later." = "Ocorreu um erro ao transferir a actualização. Por favor novamente tente mais tarde."; + +"An error occurred while extracting the archive. Please try again later." = "Ocorreu um erro ao extrair o arquivo. Por favor novamente tente mais tarde."; + +"An error occurred while installing the update. Please try again later." = "Ocorreu um erro ao instalar a actualização. Por favor novamente tente mais tarde."; + +"An error occurred while parsing the update feed." = "Ocorrer um erro ao processar o feed de actualização."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Ocorreu um erro ao reiniciar o %1$@, mas a nova versão estará disponível na próxima vez que iniciar o %1$@."; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Cancelar"; + +"Cancel Update" = "Cancelar actualização"; + +"Checking for updates..." = "A procurar actualizações…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "A transferir actualização…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "A extrair actualização…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Instalar e reiniciar"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "A instalar actualização…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +"OK" = "OK"; + +"Ready to Install" = "Pronto para instalar"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Deverá o %1$@ procurar por actualizações automaticamente? Pode sempre procurar actualizações manualmente a partir do menu do %1$@."; + +"Update Error!" = "Erro na actualização!"; + +"Updating %@" = "A actualizar o %@"; + +"You already have the newest version of %@." = "Já tem a versão mais recente do %@."; + +"You're up-to-date!" = "Está actualizado!"; + diff --git a/Frameworks/Sparkle/Sparkle/ro.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/ro.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..82772f848 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ro.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ro.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/ro.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..3f652c77a --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ro.lproj/SUUpdateAlert.xib @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ro.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/ro.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..21712d375 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ro.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this. + +This is the information that would be sent: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ro.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/ro.lproj/Sparkle.strings new file mode 100644 index 000000000..648000f7f --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ro.lproj/Sparkle.strings @@ -0,0 +1,85 @@ + + +"%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$@ a fost descărcată și este gata de utilizare! Aceasta este o actualizare importantă; dorești să o instalezi și să relansați %1$@ acum?"; + +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ a fost descărcată și este gata de utilizare! Dorești să o instalezi și să relansați %1$@ acum?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ nu poate fi actualizată atunci când a fost pornită de pe un volum read-only ca o imagine disc sau o unitate optică. Mută %1$@ în directorul Aplicații, repornește-o de acolo și încearcă din nou."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ este cea ultima versiune disponibilă."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ este disponibilă—tu ai %3$@. Dorești să o descărcarci acum?"; + +"%@ downloaded" = "%@ descărcat"; + +"%@ of %@" = "%1$@ din %2$@"; + +"A new version of %@ is available!" = "O nouă versiune pentru %@ este disponibilă!"; + +"A new version of %@ is ready to install!" = "O nouă versiune pentru %@ este gata de instalare!"; + +"An error occurred in retrieving update information. Please try again later." = "A apărut o eroare în timpul preluari informaţiilor pentru actualizare. Te rog încercă din nou mai târziu."; + +"An error occurred while downloading the update. Please try again later." = "A apărut o eroare în timp ce se descărca actualizărea. Te rog încercă din nou mai târziu."; + +"An error occurred while extracting the archive. Please try again later." = "A apărut o eroare în timpul dezarhivării. Te rog încercă din nou mai târziu."; + +"An error occurred while installing the update. Please try again later." = "A apărut o eroare în timpul instalări actualizări. Te rog încercă din nou mai târziu."; + +"An error occurred while parsing the update feed." = "A apărut o eroare în timpul citiri feed-ului de actualizare."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "A apărut o eroare în timpul relansării aplicației %1$@, dar noua versiune va fii disponibilă data viitoare când vei reporni %1$@."; + +"An important update to %@ is ready to install" = "O actualizare importantă pentru %@ este gata pentru a fi instalată"; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Anulează"; + +"Cancel Update" = "Anulează actualizarea"; + +"Checking for updates..." = "Verifică de actualizări…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Descarcă actualizarea…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Dezarhivează actualizarea…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Instalează și Redeschide"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Instalează actualizarea…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +/* OK button. */ +"OK" = "OK"; + +/* Status message on progress window once download has finished. */ +"Ready to Install" = "Pregatit pentru a instala"; + +/* Message that is optionally shown at startup to allow users to turn on/off update checks. */ +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ ar trebui ca să caute în mod automat pentru actualizări? Puteți verifica mereu pentru actualizări din meniul %1$@."; + +"Update Error!" = "Eroare Actualizare!"; + +"Updating %@" = "Actualizează %@"; + +/* 'Error' message when the user checks for updates but is already current or the feed doesn't contain any updates. (not necessarily shown in UI) */ +"You already have the newest version of %@." = "Ai cea mai nouă versiune de %@."; + +/* 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!" = "Ai ultima versiune!"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ +"Learn More..." = "Află mai multe…"; diff --git a/Frameworks/Sparkle/Sparkle/ru.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/ru.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..250e33441 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ru.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ru.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/ru.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..6f36ee828 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ru.lproj/SUUpdateAlert.xib @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ru.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/ru.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..5217d7b8e --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ru.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Использование анонимного профиля системы помогает нам в планировании будущей работы по разработке. Если у вас есть какие-либо вопросы по этой теме, обращайтесь к нам. + +Это информация, предназначенная для отправления: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/ru.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/ru.lproj/Sparkle.strings new file mode 100644 index 000000000..80ba0f6c9 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/ru.lproj/Sparkle.strings @@ -0,0 +1,75 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ загружен и готов к использованию! Хотите установить и перезапустить %1$@?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "Во время работы %1$@ с тома, предназначенного только для чтения, как например, образа диска или накопителя на оптических дисках, его невозможно обновить. Переместите %1$@ в Папку приложений, перезапустите его оттуда и повторите попытку."; + +"%@ %@ is currently the newest version available." = "В настоящий момент %1$@ %2$@ является новейшей версией."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ теперь доступен – вы имеете %3$@. Хотите загрузить его сейчас?"; + +"%@ downloaded" = "%@ загружено"; + +"%@ of %@" = "%1$@ из %2$@"; + +"A new version of %@ is available!" = "Имеется новая версия %@!"; + +"A new version of %@ is ready to install!" = "Новая версия %@ готова к установке!"; + +"An error occurred in retrieving update information. Please try again later." = "Произошла ошибка при извлечении информации обновления. Повторите попытку позже."; + +"An error occurred while downloading the update. Please try again later." = "Произошла ошибка при загрузке обновления. Повторите попытку позже."; + +"An error occurred while extracting the archive. Please try again later." = "Произошла ошибка при извлечении архива. Повторите попытку позже."; + +"An error occurred while installing the update. Please try again later." = "Произошла ошибка при установке обновления. Повторите попытку позже."; + +"An error occurred while parsing the update feed." = "Ошибка произошла при извлечении канала обновления."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Произошла ошибка при перезапуске %1$@, но при последующем запуске %1$@ будет доступна новая версия."; + +/* the unit for bytes */ +"B" = "Б"; + +"Cancel" = "Отменить"; + +"Cancel Update" = "Отменить обновление"; + +"Checking for updates..." = "Проверяю наличие обновлений…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Загружаю обновление…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Извлекаю обновление…"; + +/* the unit for gigabytes */ +"GB" = "ГБ"; + +"Install and Relaunch" = "Установить и перезапустить"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Устанавливаю обновление…"; + +/* the unit for kilobytes */ +"KB" = "КБ"; + +/* the unit for megabytes */ +"MB" = "МБ"; + +"OK" = "OK"; + +"Ready to Install" = "Готов к установке"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Должен ли %1$@ выполнять автоматическую проверку обновлений? Вы всегда можете выполнять проверку обновлений вручную в меню %1$@."; + +"Update Error!" = "Ошибка при обновлении!"; + +"Updating %@" = "Обновляю %@"; + +"You already have the newest version of %@." = "Вы уже имеете самую новую версию %@."; + +"You're up-to-date!" = "У вас все обновлено!"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ + +"Learn More..." = "Узнать больше…"; diff --git a/Frameworks/Sparkle/Sparkle/sk.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/sk.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..c999eaab4 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/sk.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/sk.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/sk.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..c047f054b --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/sk.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/sk.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/sk.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..3f95cb61c --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/sk.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Anonymný profil systému nám umožní zlepšiť plánovanie budúceho vývoja aplikácie. Ak máte ohľadom tohto akékoľvek otázky, neváhajte a kontaktujte nás. + +Odosielané budú nasledujúce informácie: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/sk.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/sk.lproj/Sparkle.strings new file mode 100644 index 000000000..4efb5311e --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/sk.lproj/Sparkle.strings @@ -0,0 +1,71 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "Aplikácia %1$@ %2$@ bola prevzatá a je pripravená na použitie! Chcete teraz nainštalovať a následne znovu spustiť %1$@?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "Aplikáciu %1$@ nemožno aktualizovať, ak je spustená zo zväzku s právami len na čítanie (napríklad z obrazu disku alebo optického disku). Presuňte aplikáciu %1$@ do priečinka Applications, spustite ju odtiaľ a potom znova skúste aktualizáciu."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@\nje najnovšia dostupná verzia."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "Je dostupná aplikácia %1$@ %2$@ — máte %3$@. Chcete ju prevziať teraz?"; + +"%@ downloaded" = "%@ prevzaté"; + +"%@ of %@" = "%1$@ z %2$@"; + +"A new version of %@ is available!" = "Je dostupná nová verzia aplikácie %@!"; + +"A new version of %@ is ready to install!" = "Nová verzia aplikácie %@ je pripravená na inštaláciu!"; + +"An error occurred in retrieving update information. Please try again later." = "Pri získavaní informácie o aktualizácii sa vyskytla chyba. Skúste neskôr."; + +"An error occurred while downloading the update. Please try again later." = "Pri preberaní aktualizácie sa vyskytla chyba. Skúste neskôr."; + +"An error occurred while extracting the archive. Please try again later." = "Pri rozbaľovaní archívu sa vyskytla chyba. Skúste neskôr."; + +"An error occurred while installing the update. Please try again later." = "Pri inštalácii aktualizácie sa vyskytla chyba. Skúste neskôr."; + +"An error occurred while parsing the update feed." = "Pri analyzovaní aktualizácie sa vyskytla chyba."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Pri spustení %1$@ sa vyskytla chyba, avšak nová verzia bude dostupná pri opätovnom štarte %1$@."; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Zrušiť"; + +"Cancel Update" = "Zrušiť aktualizáciu"; + +"Checking for updates..." = "Kontrolujú sa aktualizácie…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Preberá sa aktualizácia…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Rozbaľuje sa aktualizácia…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Inštalovať a znovu spustiť"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Inštaluje sa aktualizácia…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +"OK" = "OK"; + +"Ready to Install" = "Pripravené na inštaláciu"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Môže %1$@ automaticky kontrolovať aktualizácie? Kedykoľvek ich môžete z ponuky %1$@ skontrolovať aj manuálne."; + +"Update Error!" = "Chyba aktualizácie!"; + +"Updating %@" = "Aktualizuje sa %@"; + +"You already have the newest version of %@." = "Máte aktuálnu verziu aplikácie %@."; + +"You're up to date!" = "Máte aktuálnu verziu!"; +"You're up-to-date!" = "Máte aktuálnu verziu!"; diff --git a/Frameworks/Sparkle/Sparkle/sl.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/sl.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..605ee9aea --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/sl.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/sl.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/sl.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..0021bda78 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/sl.lproj/SUUpdateAlert.xib @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/sl.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/sl.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..4694fee95 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/sl.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Anonimni profil sistema se uporablja za načrtovanje nadaljnega razvoja programa. V primeru vprašanj nas lahko kontaktirate. + +Pošljejo se sledeče informacije: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/sl.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/sl.lproj/Sparkle.strings new file mode 100644 index 000000000..13d790b01 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/sl.lproj/Sparkle.strings @@ -0,0 +1,70 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ je bil uspešno prenešen s spleta in je pripravljen na namestitev. Ga želite namestiti in ponovno zagnati takoj?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "Programa %1$@ ni mogoče posodobiti, ker ga poganjate iz lokacije, kamor pisanje ni dovoljeno (pogosto je to slika diska dmg ali optična enota). Poskusite %1$@ premakniti v direktorij z aplikacijami (Applications), ga ponovno zagnati in šele nato posodobiti."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ je najnovejša verzija programa."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "Na voljo je %1$@ %2$@ — vi imate %3$@. Ga želite prenesti s spleta sedaj?"; + +"%@ downloaded" = "prenešenih je %@"; + +"%@ of %@" = "%1$@ od %2$@"; + +"A new version of %@ is available!" = "Na voljo je nova verzija programa %@."; + +"A new version of %@ is ready to install!" = "Najnovejša verzija programa %@ je že nameščena."; + +"An error occurred in retrieving update information. Please try again later." = "Med iskanjem posodobitev je prišlo do napake. Prosimo poskusite ponovno čez nekaj časa."; + +"An error occurred while downloading the update. Please try again later." = "Med prenašanje posodobitve s spleta je prišlo do napake. Prosimo poskusite ponovno čez nekaj časa."; + +"An error occurred while extracting the archive. Please try again later." = "Med odpiranjem arhiva je prišlo do napake. Prosimo poskusite ponovno čez nekaj časa."; + +"An error occurred while installing the update. Please try again later." = "Med nameščanjem posodobitve je prišlo do napake. Prosimo poskusite ponovno čez nekaj časa."; + +"An error occurred while parsing the update feed." = "Napaka pri interpretaciji RSS vira s posodobitvami."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Med ponovnim zagonom programa %1$@ je sicer prišlo do napake, vendar bo nova verzija na voljo, ko boste naslednjič pognali program."; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Prekliči"; + +"Cancel Update" = "Prekliči posodabljanje"; + +"Checking for updates..." = "Iskanje posodobitev …"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Prenašanje posodobitve …"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Razpakiranje posodobitve …"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Namesti in ponovno zaženi"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Nameščanje posodobitve …"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +"OK" = "V redu"; + +"Ready to Install" = "Pripravljen na namestitev"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Naj %1$@ samodejno preverja, če so na voljo posodobitve? To lahko kadarkoli preverite tudi sami iz menija za %1$@."; + +"Update Error!" = "Napaka pri posodabljanju"; + +"Updating %@" = "Posodabljam %@"; + +"You already have the newest version of %@." = "Najnovejša verzija programa %@ je že nameščena."; + +"You're up-to-date!" = "Uporabljate zadnjo verzijo."; diff --git a/Frameworks/Sparkle/Sparkle/sv.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/sv.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..af7d65397 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/sv.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/sv.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/sv.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..39c405b06 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/sv.lproj/SUUpdateAlert.xib @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/sv.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/sv.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..24c5d46f3 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/sv.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sök efter uppdateringar automatiskt? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Anonym systemprofilinformation används för att hjälpa oss att planera framtida utvecklingsarbete. Vänligen kontakta oss ifall du har några frågot om detta. + +Detta är informationen som skulle sändas: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/sv.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/sv.lproj/Sparkle.strings new file mode 100644 index 000000000..70fe51240 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/sv.lproj/Sparkle.strings @@ -0,0 +1,75 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ har laddats ned och är klar att använda! Vill du installera det och starta %1$@ nu?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ kan inte uppdateras när det körs från en skrivskyddad volym som en skivavbild eller en optisk enhet. Flytta %1$@ till mappen Program, starta om den därifrån, och försök igen."; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ är för närvarande den senaste tillgängliga versionen."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ är nu tillgänglig—du har %3$@. Vill du ladda ned nu?"; + +"%@ downloaded" = "%@ nedladdat"; + +"%@ of %@" = "%1$@ av %2$@"; + +"A new version of %@ is available!" = "En ny version av %@ finns tillgänglig!"; + +"A new version of %@ is ready to install!" = "En ny version av %@ är redo att installeras!"; + +"An error occurred in retrieving update information. Please try again later." = "Ett fel uppstod vid hämtning av information om uppdateringar. Försök igen senare."; + +"An error occurred while downloading the update. Please try again later." = "Ett fel uppstod vid hämtning av uppdateringen. Försök igen senare."; + +"An error occurred while extracting the archive. Please try again later." = "Ett fel uppstod vid extrahering av arkivet. Försök igen senare."; + +"An error occurred while installing the update. Please try again later." = "Ett fel uppstod vid installationen av uppdateringen. Försök igen senare."; + +"An error occurred while parsing the update feed." = "Ett fel uppstod vid tolkning av uppdateringslänken."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Ett fel uppstod vid omstart %1$@, men den nya versionen kommer att finnas tillgänglig nästa gång du kör %1$@."; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "Avbryt"; + +"Cancel Update" = "Avbryt uppdatering"; + +"Checking for updates..." = "Söker efter uppdateringar…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Laddar ned uppdatering…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Extraherar uppdatering…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "Installera och starta om"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Installerar uppdatering…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +"OK" = "OK"; + +"Ready to Install" = "Redo att installera"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Bör %1$@ automatiskt söka efter uppdateringar? Du kan alltid söka efter uppdateringar manuellt från %1$@ menyn."; + +"Update Error!" = "Uppdateringsfel!"; + +"Updating %@" = "Uppdaterar %@"; + +"You already have the newest version of %@." = "Du har redan den nyaste versionen av %@."; + +"You're up-to-date!" = "Du är uppdaterad!"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ + +"Learn More..." = "Learn More…"; diff --git a/Frameworks/Sparkle/Sparkle/th.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/th.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..e1724b958 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/th.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/th.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/th.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..cf4500471 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/th.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/th.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/th.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..607c4006f --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/th.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + ข้อมูลระบบแบบนิรนามช่วยในการวางแผนพัฒนาแอปพลิเคชันของเราในอนาคต กรุณาติดต่อเราถ้าคุณมีข้อสงสัยในเรื่องนี้ + +นี่คือข้อมูลที่จะถูกส่งไป: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/th.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/th.lproj/Sparkle.strings new file mode 100644 index 000000000..e58bdaef1 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/th.lproj/Sparkle.strings @@ -0,0 +1,80 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ ได้ถูกดาวน์โหลดและพร้อมใช้งานแล้ว คุณต้องการติดตั้งและเริ่ม %1$@ ใหม่เดี๋ยวนี้หรือไม่"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ ไม่สามารถรับการอัพเดทได้เมื่อถูกเรียกจากดิสก์แบบอ่านอย่างเดียวหรือซีดีรอม ย้าย %1$@ ไปยังโฟลเดอร์แอปพลิเคชัน และเรียกใช้งาน จากนั้นลองใหม่อีกครั้ง"; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ เป็นเวอร์ชั่นใหม่ล่าสุดแล้ว"; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ พร้อมให้ดาวน์โหลดแล้ว (คุณมีเวอร์ชั่น %3$@) ต้องการดาวน์โหลดเลยหรือไม่"; + +"%@ downloaded" = "ดาวน์โหลด %@ เสร็จสิ้น"; + +"%@ of %@" = "%1$@ จาก %2$@"; + +"A new version of %@ is available!" = "%@ มีเวอร์ชั่นใหม่!"; + +"A new version of %@ is ready to install!" = "เวอร์ชั่นใหม่ของ %@ พร้อมสำหรับการติดตั้งแล้ว"; + +"An error occurred in retrieving update information. Please try again later." = "เกิดข้อผิดพลาดระหว่างการรับข้อมูลอัพเดท กรุณาลองใหม่ในภายหลัง"; + +"An error occurred while downloading the update. Please try again later." = "เกิดข้อผิดพลาดระหว่างพยายามดาวน์โหลดอัพเดท กรุณาลองใหม่ในภายหลัง"; + +"An error occurred while extracting the archive. Please try again later." = "เกิดข้อผิดพลาดระหว่างการแตกไฟล์ที่ถูกบีบอัด กรุณาลองใหม่ในภายหลัง"; + +"An error occurred while installing the update. Please try again later." = "เกิดข้อผิดพลาดระหว่างการติดตั้งอัพเดท กรุณาลองใหม่ในภายหลัง"; + +"An error occurred while parsing the update feed." = "เกิดข้อผิดพลาดระหว่างการประมวลผลฟีดอัพเดท กรุณาลองใหม่ในภายหลัง"; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "เกิดข้อผิดพลาดระหว่างการเริ่ม %1$@ ใหม่ อย่างไรก็ตามเวอร์ชั่นใหม่จะใช้ได้เมื่อคุณเรียก %1$@ ครั้งถัดไป"; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "ยกเลิก"; + +"Cancel Update" = "ยกเลิกอัพเดท"; + +"Checking for updates..." = "ตรวจสอบอัพเดท…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "กำลังดาวน์โหลดอัพเดท…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "กำลังแตกไฟล์อัพเดท…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "ติดตั้งและเริ่มแอปพลิเคชันใหม่"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "กำลังติดตั้งอัพเดท…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +/* OK button. */ +"OK" = "ตกลง"; + +/* Status message on progress window once download has finished. */ +"Ready to Install" = "พร้อมติดตั้ง"; + +/* Message that is optionally shown at startup to allow users to turn on/off update checks. */ +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "คุณต้องการให้ %1$@ ตรวจสอบอัพเดทโดยอัตโนมัติหรือไม่ คุณสามารถเริ่มการตรวจสอบอัพเดทด้วยตนเองได้ทุกเมื่อจากเมนูของ %1$@"; + +"Update Error!" = "อัพเดทผิดพลาด!"; + +"Updating %@" = "กำลังอัพเดท %@"; + +/* 'Error' message when the user checks for updates but is already current or the feed doesn't contain any updates. (not necessarily shown in UI) */ +"You already have the newest version of %@." = "คุณมีเวอร์ชั่นล่าสุดของ %@ แล้ว"; + +/* 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!" = "คุณมีเวอร์ชั่นล่าสุดแล้ว!"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ +"Learn More..." = "เรียนรู้เพิ่มเติม…"; + diff --git a/Frameworks/Sparkle/Sparkle/tr.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/tr.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..68f8a8b70 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/tr.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/tr.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/tr.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..48dd1cff0 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/tr.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/tr.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/tr.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..74df9320f --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/tr.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + + + + + + + + + + + + + + + Gönderdiğiniz isimsiz Sistem-Bilgileri bu Programın gelişimi için kullanılmatadır. Bu konu hakkında daha fazla Bilgi edinmek için, bizimle bağlantıya geçiniz. + +Göndereceğiniz Bilgiler: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/tr.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/tr.lproj/Sparkle.strings new file mode 100644 index 000000000..bce70beb9 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/tr.lproj/Sparkle.strings @@ -0,0 +1,123 @@ +/* de_DE v0.1 - No comment provided by engineer. */ + +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ indirildi ve kullanıma hazır! Şimdi yüklemek istiyor musunuz? Uygulama yeniden başlatılacaktır."; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"%1$@ can't be updated when it's running from a disk image. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ uygulaması disk kalıbı içerisindeyken güncellenemez. Lütfen %1$@ uygulamasını Uygulamalar dizinine kopyalayıp yeniden başlatınız."; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ mevcut en yeni sürümdür."; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ çıktı (Kullandığınız Sürüm: %3$@). Şimdi yeni sürümü indirmek ister misiniz?"; + + +"%@ downloaded" = "%@ indirildi"; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"%@ of %@" = "%1$@ / %2$@"; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"A new version of %@ is available!" = "%@ uygulaması için yeni bir sürüm var!"; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"A new version of %@ is ready to install!" = "%@ uygulamasının yeni bir sürümü yüklemeye hazır!"; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"An error occurred in retrieving update information. Please try again later." = "Güncelleme bilgilerini alırken bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"An error occurred while downloading the update. Please try again later." = "Güncelleme indirilirken bir hata oluştu. Lütfen sonra tekrar deneyiniz."; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"An error occurred while extracting the archive. Please try again later." = "İndirilen arşivi açarken bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"An error occurred while installing the update. Please try again later." = "Güncellemeyi yüklerken bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"An error occurred while parsing the update feed." = "Güncelleme kaynağını incelerken bir hata oluştu."; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"An error occurred while parsing the update feed: %@" = "Güncelleme kaynağını incelerken bir hata oluştu: %@"; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "%1$@ uygulamasını açarken bir hata oluştu; ancak güncelleme %1$@ uygulamasını yeniden başlattığınızda hazır olacaktır."; + +/* de_DE v0.1 - the unit for bytes */ + +"B" = "B"; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"Cancel" = "Vazgeç"; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"Cancel Update" = "Güncellemeyi İptal Et"; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"Checking for updates..." = "Güncellemelere bakılıyor..."; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"Downloading update..." = "Güncelleme indiriliyor..."; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"Extracting update..." = "Güncelleme ayıklanıyor..."; + +/* de_DE v0.1 - the unit for gigabytes */ + +"GB" = "GB"; + +/* de_DE v0.1 - No comment provided by engineer. */ + +"Install and Relaunch" = "Kur ve Yeniden Başlat"; + + +"Installing update..." = "Güncelleme kuruluyor..."; + +/* the unit for kilobytes */ + +"KB" = "KB"; + +/* the unit for megabytes */ + +"MB" = "MB"; + + +"OK" = "Tamam"; + + +"Ready to Install" = "Kuruluma Hazır"; + + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ uygulaması için güncellemeler otomatik olarak aransın mı? Güncelleme işlemini el ile uygulama menüsünden de başlatabilirsiniz."; + + +"Update Error!" = "Güncelleme Hatası."; + + +"Updating %@" = "%@ güncelleniyor"; + + +"You already have the newest version of %@." = "%@ uygulamasının en güncel sürümü sizde mevcut."; + + +"You're up to date!" = "Güncellemeye gerek yok."; + diff --git a/Frameworks/Sparkle/Sparkle/uk.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/uk.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..271b16ba9 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/uk.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/uk.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/uk.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..e130c93e3 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/uk.lproj/SUUpdateAlert.xib @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/uk.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/uk.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..7890e9975 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/uk.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + Використання анонімного профілю системи допомагає нам у планування майбутньої розробки. Якщо у вас виникли питання щодо цього, звертайтесь до нас. + +Інформація, що буде надіслано: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/uk.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/uk.lproj/Sparkle.strings new file mode 100644 index 000000000..fdee4409b --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/uk.lproj/Sparkle.strings @@ -0,0 +1,75 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ завантажений і готовий до використання! Бажаєте встановити і перезавантажити %1$@?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "Під час роботи з %1$@ з тому, що призначений лише для читання, наприклад, образу диска чи оптичного диску, його неможливо оновити. Перемістіть %1$@ у папку з програмами, перезавантажте його звідти і спробуйте ще раз."; + +"%@ %@ is currently the newest version available." = "У данний момент %1$@ %2$@ є останньою версією."; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ доступна – ви маєте %3$@. Бажаєте завантажити її зараз?"; + +"%@ downloaded" = "%@ завантажено"; + +"%@ of %@" = "%1$@ із %2$@"; + +"A new version of %@ is available!" = "Доступна нова версія %@!"; + +"A new version of %@ is ready to install!" = "Нова версія %@ готова до встановлення!"; + +"An error occurred in retrieving update information. Please try again later." = "Виникла помилка при отриманні інформації про оновлення. Спробуйте ще пізніше."; + +"An error occurred while downloading the update. Please try again later." = "Виникла помилка при завантаження оновлення. Спробуйте ще пізніше."; + +"An error occurred while extracting the archive. Please try again later." = "Виникла помилка при розпаковуванні архіву. Спробуйте ще пізніше."; + +"An error occurred while installing the update. Please try again later." = "Виникла помилка при встановленні оновлення. Спробуйте ще пізніше."; + +"An error occurred while parsing the update feed." = "Виникла помилка при розборі фіду оновлень."; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "Виникла помилка при перезавантаженні %1$@, але наступного разу при завантаження %1$@ буде доступна нова версія."; + +/* the unit for bytes */ +"B" = "Б"; + +"Cancel" = "Відмінити"; + +"Cancel Update" = "Відмінити оновлення"; + +"Checking for updates..." = "Перевіря наявність оновлень…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "Завантажую оновлення…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "Розпаковую оновлення…"; + +/* the unit for gigabytes */ +"GB" = "ГБ"; + +"Install and Relaunch" = "Встановити та перезавантажити"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "Встановлюю оновлення…"; + +/* the unit for kilobytes */ +"KB" = "КБ"; + +/* the unit for megabytes */ +"MB" = "МБ"; + +"OK" = "OK"; + +"Ready to Install" = "Готовий до встановлення"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Чи повинен %1$@ автоматично виконувати перевірку на оновлення? Ви завжди можете самостійно перевірити оновлення у меню %1$@."; + +"Update Error!" = "Помилка оновлення!"; + +"Updating %@" = "Оновлюю %@"; + +"You already have the newest version of %@." = "Ви вже маєте саму останню версію программи %@."; + +"You're up-to-date!" = "У вас остання версія!"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ + +"Learn More..." = "Дізнатись більше…"; diff --git a/Frameworks/Sparkle/Sparkle/zh_CN.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/zh_CN.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..f0040bc5b --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/zh_CN.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/zh_CN.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/zh_CN.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..6503aebce --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/zh_CN.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/zh_CN.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/zh_CN.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..419b09283 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/zh_CN.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + 无记名系统概况信息被用于帮助我们安排将来的开发工作。如果对此存在疑问请联系我们。 + +这是将要被发送的信息：: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/zh_CN.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/zh_CN.lproj/Sparkle.strings new file mode 100644 index 000000000..091ac8cb9 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/zh_CN.lproj/Sparkle.strings @@ -0,0 +1,75 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下载完毕并可以使用！您想要现在安装 %1$@ 吗?"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "%1$@ 不能被更新，当它运行于一个只读性宗卷如磁盘映像、软盘等上面时。移动 %1$@ 到应用程序文件夹并再试一次。"; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ 是当前的最新版本。"; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ 已经可供下载—你现在的版本是 %3$@。您要现在下载它吗？"; + +"%@ downloaded" = "%@ 已下载"; + +"%@ of %@" = "%1$@ / %2$@"; + +"A new version of %@ is available!" = "新版本的 %@ 已经提供下载了！"; + +"A new version of %@ is ready to install!" = "新版本的 %@ 可以安装了！"; + +"An error occurred in retrieving update information. Please try again later." = "接收升级信息时出现错误。请稍后再试。"; + +"An error occurred while downloading the update. Please try again later." = "下载过程中出现错误。请稍后再试。"; + +"An error occurred while extracting the archive. Please try again later." = "提取过程中出现错误。请稍后再试。"; + +"An error occurred while installing the update. Please try again later." = "安装更新的过程中出现错误。请稍后再试。"; + +"An error occurred while parsing the update feed." = "在分析更新流语法时出现错误。请稍后再试。"; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "重新启动 %1$@ 时发生了一个错误，但在您下次运行 %1$@ 时新版本将可使用。"; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "取消"; + +"Cancel Update" = "取消更新"; + +"Checking for updates..." = "正在核查更新…"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "正在下载更新…"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "正在抽出更新…"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "安装并重新启动"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "正在安装更新…"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +"OK" = "好"; + +"Ready to Install" = "可以开始安装了"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "您想让 %1$@ 在启动时自动检查更新么？您也可以在程序菜单 %1$@ 中进行手动检查。"; + +"Update Error!" = "更新错误！"; + +"Updating %@" = "正在更新 %@"; + +"You already have the newest version of %@." = "您已经在使用最新版本的 %@。"; + +"You're up-to-date!" = "你使用的就是最新版！"; + +/* Alternative name for "Install" button if we have a paid update or other update + without a download but with a URL. */ + +"Learn More..." = "下载更新包"; diff --git a/Frameworks/Sparkle/Sparkle/zh_TW.lproj/SUAutomaticUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/zh_TW.lproj/SUAutomaticUpdateAlert.xib new file mode 100644 index 000000000..6f05efa5b --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/zh_TW.lproj/SUAutomaticUpdateAlert.xib @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/zh_TW.lproj/SUUpdateAlert.xib b/Frameworks/Sparkle/Sparkle/zh_TW.lproj/SUUpdateAlert.xib new file mode 100644 index 000000000..afd653cae --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/zh_TW.lproj/SUUpdateAlert.xib @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/zh_TW.lproj/SUUpdatePermissionPrompt.xib b/Frameworks/Sparkle/Sparkle/zh_TW.lproj/SUUpdatePermissionPrompt.xib new file mode 100644 index 000000000..4fdeb663a --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/zh_TW.lproj/SUUpdatePermissionPrompt.xib @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + visibleKey + visibleValue + displayValue + displayKey + + + + + + + + + + + + + + + 匿名系統描述資訊可用來協助我們計畫未來的開發工作。若您有任何相關問題，請與我們聯繫。 + +以下是會傳送的資訊： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SUIncludeProfile + SUSendProfileInfo + + + + + + + diff --git a/Frameworks/Sparkle/Sparkle/zh_TW.lproj/Sparkle.strings b/Frameworks/Sparkle/Sparkle/zh_TW.lproj/Sparkle.strings new file mode 100644 index 000000000..fe5af9952 --- /dev/null +++ b/Frameworks/Sparkle/Sparkle/zh_TW.lproj/Sparkle.strings @@ -0,0 +1,70 @@ +"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下載且可供使用！您是否要現在安裝並重新啟動%1$@？"; + +"%1$@ can't be updated when it's running from a read-only volume like a disk image or an optical drive. Move %1$@ to your Applications folder, relaunch it from there, and try again." = "當 %1$@ 正從唯讀卷宗（如磁碟映像檔或光碟機）執行時，無法進行更新。請將 %1$@ 移至您的“應用程式”檔案夾，從該處重新啟動，然後再試一次。 "; + +"%@ %@ is currently the newest version available." = "%1$@ %2$@ 已是目前最新的版本。"; + +"%@ %@ is now available--you have %@. Would you like to download it now?" = "%1$@ %2$@ 現在已可取得，您的版本則是 %3$@。您要現在下載嗎？"; + +"%@ downloaded" = "%@ 已下載"; + +"%@ of %@" = "%1$@ / %2$@"; + +"A new version of %@ is available!" = "已有新版本的 %@ 可供下載！"; + +"A new version of %@ is ready to install!" = "新版本的 %@ 已準備安裝！"; + +"An error occurred in retrieving update information. Please try again later." = "擷取更新資訊時發生錯誤。請稍後再試一次。請稍後再試一次。"; + +"An error occurred while downloading the update. Please try again later." = "下載更新項目時發生錯誤。請稍後再試一次。"; + +"An error occurred while extracting the archive. Please try again later." = "解壓縮封存檔時發生錯誤。請稍後再試一次。"; + +"An error occurred while installing the update. Please try again later." = "安裝更新項目時發生錯誤。請稍後再試一次。"; + +"An error occurred while parsing the update feed." = "解析更新 feed 時發生錯誤。"; + +"An error occurred while relaunching %1$@, but the new version will be available next time you run %1$@." = "重新啟動 %1$@ 時發生錯誤，但下次您執行 %1$@ 時將可使用新版本。"; + +/* the unit for bytes */ +"B" = "B"; + +"Cancel" = "取消"; + +"Cancel Update" = "取消更新"; + +"Checking for updates..." = "正在檢查更新項目⋯"; + +/* Take care not to overflow the status window. */ +"Downloading update..." = "正在下載更新項目⋯"; + +/* Take care not to overflow the status window. */ +"Extracting update..." = "正在解壓縮更新項目⋯"; + +/* the unit for gigabytes */ +"GB" = "GB"; + +"Install and Relaunch" = "安裝與重新啟動"; + +/* Take care not to overflow the status window. */ +"Installing update..." = "正在安裝更新項目⋯"; + +/* the unit for kilobytes */ +"KB" = "KB"; + +/* the unit for megabytes */ +"MB" = "MB"; + +"OK" = "好"; + +"Ready to Install" = "準備安裝"; + +"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ 是否應自動檢查更新項目？您可隨時從 %1$@ 選單手動檢查更新項目。"; + +"Update Error!" = "更新發生錯誤！"; + +"Updating %@" = "正在更新 %@"; + +"You already have the newest version of %@." = "您已有最新版本的 %@。"; + +"You're up-to-date!" = "你已有最新版本！"; diff --git a/Frameworks/Sparkle/TestApplication/English.lproj/InfoPlist.strings b/Frameworks/Sparkle/TestApplication/English.lproj/InfoPlist.strings new file mode 100644 index 000000000..e6e21d400 --- /dev/null +++ b/Frameworks/Sparkle/TestApplication/English.lproj/InfoPlist.strings @@ -0,0 +1,4 @@ +/* Localized versions of Info.plist keys */ + +NSHumanReadableCopyright = "© Andy Matuschak, 2006"; +CFBundleShortVersionString = "1.5"; \ No newline at end of file diff --git a/Frameworks/Sparkle/TestApplication/English.lproj/MainMenu.xib b/Frameworks/Sparkle/TestApplication/English.lproj/MainMenu.xib new file mode 100644 index 000000000..5bf06c630 --- /dev/null +++ b/Frameworks/Sparkle/TestApplication/English.lproj/MainMenu.xib @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Frameworks/Sparkle/TestApplication/TestApplication-Info.plist b/Frameworks/Sparkle/TestApplication/TestApplication-Info.plist new file mode 100644 index 000000000..be2bc9382 --- /dev/null +++ b/Frameworks/Sparkle/TestApplication/TestApplication-Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + org.sparkle-project.SparkleTestApp + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Sparkle Test App + CFBundlePackageType + APPL + CFBundleSignature + ???? + CFBundleVersion + 1.5 + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + SUEnableSystemProfiling + + SUFeedURL + http://sparkle-project.org/files/sparkletestcast.xml + SUPublicDSAKeyFile + test_app_only_dsa_pub.pem + + diff --git a/Frameworks/Sparkle/TestApplication/main.m b/Frameworks/Sparkle/TestApplication/main.m new file mode 100644 index 000000000..f858e8756 --- /dev/null +++ b/Frameworks/Sparkle/TestApplication/main.m @@ -0,0 +1,14 @@ +// +// main.m +// Sparkle +// +// Created by Andy Matuschak on 3/12/06. +// Copyright Andy Matuschak 2006. All rights reserved. +// + +#import + +int main(int argc, char *argv[]) +{ + return NSApplicationMain(argc, (const char **)argv); +} diff --git a/Frameworks/Sparkle/TestApplication/test_app_only_dsa_pub.pem b/Frameworks/Sparkle/TestApplication/test_app_only_dsa_pub.pem new file mode 100644 index 000000000..dacd55e96 --- /dev/null +++ b/Frameworks/Sparkle/TestApplication/test_app_only_dsa_pub.pem @@ -0,0 +1,20 @@ +-----BEGIN PUBLIC KEY----- +MIIDOzCCAi0GByqGSM44BAEwggIgAoIBAQD2WbLx8Bd1b1vp8FdDpSzkHZ0tlX5x +Hrzm0WWE9IokOmJw/UWk1GQYRJnA8UlufFTJV4dZVL3It4xwqqWWFyN36LWgQUpf +ss9eTn7M7vjk7BVYch7QMs4jGEnSYkebuYfVhUZlg5VViQ+37Rj+ENtBUrkPJxIY +CGAOIJn45uX5oNIPbElFkadU6m7zd1gn8KhRgIepa2k3iBbkFuCbxTPT/aqLI+MW +8kR4jXITTgBkDew6DXLVL9SsJup4LeAEizTGyyTBY5bfMJaO8NaB8+uPrkC3SZV+ +r/LIaBcmU3vVfmw43FGzBlJtGflPaL8Ek9lRK1aSzk3Gr7tPdaado9tPAhUAmn4E +HKjL3lXfHzBmDSrrp5G5+IkCggEAFvGRfoL0u3zN4O+8imTxfiSYcFUjBUly4gIl +NXM4AgFmy8WE+diZRh6/3eg+CO0B1io+thmU2sTFAbV7sHVuGaBpPyFtcvrCHGGp +EcqWwmxuhUc1CzeoBvGw4u8mfCBvcUPjFfhllJJFdIgaTrYXFxqgsb6ZKWKsYz9J +jjJkOlRFIlRfowd1RlqodZYYvdvfWnPd32HpI9i/ofhPdlF5W2f51diH/jVJaRCo +TKECwcYG+qkPC5gkIIgzC6/DPRT8pzCLJ0NoWj3TQwL1LffMSmT9hTGAD1iyJjn5 +S9ZLLkz/K+QoGS+Rv4gboMAxa0Cla7R8NwtXqMD0kpeZwDAAgQOCAQYAAoIBAQDw +tDiRJy5DsFNRIaKe6NlyW1gyjYIhbeOCDt5fYMdX7tOR64ng28ACU5ESu6jRANMp +NYjE9oTBx28C0TXXRLDiblHe6IsisKsJJgkNkNc2DwUdPcGoPTRK/MS0k0CQsPQq +cU0Uh/vYXNQ3rsJMAJ0xJ+yYllm3MVQkbZrWlJTe/nU6M8ahiR6WBelrKhzHrhuy +MZ8n+oXvBc/Jo8Z63O/5e94BS0PiGb1Eo84ds6ramno7XJpTXE/nxphBSsaXCwdy +T97rvDzfDG0v0eo9fdX9aL7jPVODDt0bk+MSRdDpcMlgJzhIpNUtafrTUHIkPyKb +/BX9wwwXLfWGTz5TRovi +-----END PUBLIC KEY----- diff --git a/Frameworks/Sparkle/Tests/SUDSAVerifierTest.m b/Frameworks/Sparkle/Tests/SUDSAVerifierTest.m new file mode 100644 index 000000000..728453c67 --- /dev/null +++ b/Frameworks/Sparkle/Tests/SUDSAVerifierTest.m @@ -0,0 +1,86 @@ +// +// SUDSAVerifierTest.m +// Sparkle +// +// Created by Kornel on 25/07/2014. +// Copyright (c) 2014 Sparkle Project. All rights reserved. +// + +#import +#import +#import "SUDSAVerifier.h" + +@interface SUDSAVerifierTest : XCTestCase +@property NSString *testDir, *testFile, *pubKeyFile; +@end + +@implementation SUDSAVerifierTest +@synthesize testDir, testFile, pubKeyFile; + +- (void)setUp +{ + [super setUp]; + + self.testDir = [@"" __FILE__ stringByDeletingLastPathComponent]; + self.testFile = [self.testDir stringByAppendingPathComponent:@"/signed_test_file"]; + self.pubKeyFile = [self.testDir stringByAppendingPathComponent:@"test_pubkey"]; +} + +- (void)testVerifyFileAtPath +{ + NSData *pubKey = [NSData dataWithContentsOfFile:self.pubKeyFile]; + XCTAssertNotNil(pubKey, @"Public key must be readable"); + + NSString *validSig = @"MCwCFCIHCIYYkfZavNzTitTW5tlRp/k5AhQ40poFytqcVhIYdCxQznaXeJPJDQ=="; + + XCTAssertTrue([self checkFile:self.testFile + withPubKey:pubKey + signature:validSig], + @"Expected valid signature"); + + XCTAssertFalse([self checkFile:self.testFile + withPubKey:[NSData dataWithBytes:"lol" length:3] + signature:validSig], + @"Invalid pubkey"); + + XCTAssertFalse([self checkFile:self.pubKeyFile + withPubKey:pubKey + signature:validSig], + @"Wrong file checked"); + + XCTAssertFalse([self checkFile:self.testFile + withPubKey:pubKey + signature:@"MCwCFCIHCiYYkfZavNzTitTW5tlRp/k5AhQ40poFytqcVhIYdCxQznaXeJPJDQ=="], + @"Expected invalid signature"); + + XCTAssertTrue([self checkFile:self.testFile + withPubKey:pubKey + signature:@"MC0CFAsKO7cq2q7L5/FWe6ybVIQkwAwSAhUA2Q8GKsE309eugi/v3Kh1W3w3N8c="], + @"Expected valid signature"); + + XCTAssertFalse([self checkFile:self.testFile + withPubKey:pubKey + signature:@"MC0CFAsKO7cq2q7L5/FWe6ybVIQkwAwSAhUA2Q8GKsE309eugi/v3Kh1W3w3N8"], + @"Expected invalid signature"); +} + +- (BOOL)checkFile:(NSString *)aFile withPubKey:(NSData *)pubKey signature:(NSString *)sigString +{ + SUDSAVerifier *v = [[SUDSAVerifier alloc] initWithPublicKeyData:pubKey]; + + NSData *sig = [[NSData alloc] initWithBase64Encoding:sigString]; + + return [v verifyFileAtPath:aFile signature:sig]; +} + +- (void)testValidatePath +{ + NSString *pubkey = [NSString stringWithContentsOfFile:self.pubKeyFile encoding:NSASCIIStringEncoding error:nil]; + + XCTAssertTrue([SUDSAVerifier validatePath:self.testFile + withEncodedDSASignature:@"MC0CFFMF3ha5kjvrJ9JTpTR8BenPN9QUAhUAzY06JRdtP17MJewxhK0twhvbKIE=" + withPublicDSAKey:pubkey], + @"Expected valid signature"); +} + +@end diff --git a/Frameworks/Sparkle/Tests/SUUpdaterTest.m b/Frameworks/Sparkle/Tests/SUUpdaterTest.m new file mode 100644 index 000000000..81eb5bf8a --- /dev/null +++ b/Frameworks/Sparkle/Tests/SUUpdaterTest.m @@ -0,0 +1,77 @@ +// +// SUUpdaterTest.m +// Sparkle +// +// Created by Jake Petroules on 2014-06-29. +// Copyright (c) 2014 Sparkle Project. All rights reserved. +// + +#import +#import "SUConstants.h" +#import "SUUpdater.h" + +@interface SUUpdaterTest : XCTestCase +@property (strong) NSOperationQueue *queue; +@property (strong) SUUpdater *updater; +@end + +@implementation SUUpdaterTest + +@synthesize queue; +@synthesize updater; + +- (void)setUp +{ + [super setUp]; + self.queue = [[NSOperationQueue alloc] init]; + self.updater = [[SUUpdater alloc] init]; + self.updater.delegate = self; +} + +- (void)tearDown +{ + self.updater = nil; + self.queue = nil; + [super tearDown]; +} + +- (NSString *)feedURLStringForUpdater:(SUUpdater *) __unused updater +{ + return @""; +} + +- (void)testFeedURL +{ + [self.updater feedURL]; // this WON'T throw + + [self.queue addOperationWithBlock:^{ + XCTAssertTrue(![NSThread isMainThread]); + @try { + [self.updater feedURL]; + XCTFail(@"feedURL did not throw an exception when called on a secondary thread"); + } + @catch (NSException *exception) { + NSLog(@"%@", exception); + } + }]; + [self.queue waitUntilAllOperationsAreFinished]; +} + +- (void)testSetTestFeedURL +{ + [self.updater setFeedURL:[NSURL URLWithString:@""]]; // this WON'T throw + + [self.queue addOperationWithBlock:^{ + XCTAssertTrue(![NSThread isMainThread]); + @try { + [self.updater setFeedURL:[NSURL URLWithString:@""]]; + XCTFail(@"setFeedURL: did not throw an exception when called on a secondary thread"); + } + @catch (NSException *exception) { + NSLog(@"%@", exception); + } + }]; + [self.queue waitUntilAllOperationsAreFinished]; +} + +@end diff --git a/Frameworks/Sparkle/Tests/SUVersionComparisonTest.m b/Frameworks/Sparkle/Tests/SUVersionComparisonTest.m index 17759da0c..de151da74 100644 --- a/Frameworks/Sparkle/Tests/SUVersionComparisonTest.m +++ b/Frameworks/Sparkle/Tests/SUVersionComparisonTest.m @@ -6,12 +6,17 @@ // Copyright 2008 Andy Matuschak. All rights reserved. // -#import "SUVersionComparisonTest.h" #import "SUStandardVersionComparator.h" -@implementation SUVersionComparisonTest +#import -#define SUAssertOrder(a,b,c) STAssertTrue([[SUStandardVersionComparator defaultComparator] compareVersion:a toVersion:b] == c, @"b should be newer than a!") +@interface SUVersionComparisonTestCase : XCTestCase { +} +@end + +@implementation SUVersionComparisonTestCase + +#define SUAssertOrder(a,b,c) XCTAssertTrue([[SUStandardVersionComparator defaultComparator] compareVersion:a toVersion:b] == c, @"b should be newer than a!") #define SUAssertAscending(a, b) SUAssertOrder(a,b,NSOrderedAscending) #define SUAssertDescending(a, b) SUAssertOrder(a,b,NSOrderedDescending) #define SUAssertEqual(a, b) SUAssertOrder(a,b,NSOrderedSame) @@ -46,7 +51,9 @@ SUAssertAscending(@"1.0b5 (1234)", @"1.0b5 (1235)"); SUAssertAscending(@"1.0b5 (1234)", @"1.0.1b5 (1234)"); SUAssertAscending(@"1.0.1b5 (1234)", @"1.0.1b6 (1234)"); - + SUAssertAscending(@"2.0.0.2429", @"2.0.0.2430"); + SUAssertAscending(@"1.1.1.1818", @"2.0.0.2430"); + SUAssertAscending(@"3.3 (5847)", @"3.3.1b1 (5902)"); } diff --git a/Frameworks/Sparkle/Tests/SparkleTests-Info.plist b/Frameworks/Sparkle/Tests/SparkleTests-Info.plist new file mode 100644 index 000000000..779433b8b --- /dev/null +++ b/Frameworks/Sparkle/Tests/SparkleTests-Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + org.sparkle-project.Sparkle.${PRODUCT_NAME:rfc1034identifier} + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + BNDL + CFBundleSignature + ???? + CFBundleVersion + 1.0 + + diff --git a/Frameworks/Sparkle/Tests/signed_test_file b/Frameworks/Sparkle/Tests/signed_test_file new file mode 100644 index 000000000..980a0d5f1 --- /dev/null +++ b/Frameworks/Sparkle/Tests/signed_test_file @@ -0,0 +1 @@ +Hello World! diff --git a/Frameworks/Sparkle/Tests/test_pubkey b/Frameworks/Sparkle/Tests/test_pubkey new file mode 100644 index 000000000..cea8b668f --- /dev/null +++ b/Frameworks/Sparkle/Tests/test_pubkey @@ -0,0 +1,36 @@ +-----BEGIN PUBLIC KEY----- +MIIGOjCCBC0GByqGSM44BAEwggQgAoICAQCHyAu13F9I72JZzN9KgVhrprKnRH7n +dJJP5ZVHaSqm5PbRmHbnT06DGMxloZc8Nd5QWwG6N+5O1I9ZZjnIrc9Qzodho8hM +KNInrfCEy/lTHjydvQvYG2LitbknapgGTf57BWEIYSiAQyP8Gs6lTVZmGrqSJdRC +Kdt29OmFKLhWVn5hm2nx7PCbRT7FzrRyX8jkjCUKSeI/s1j3jpjFT5nGutAsSYNS +Y/ifH1/IRejv9kRUEWM7qEU/ue3C18qCoDsmTSQVh+E1MIBWqeaWWAGrw7JO4cxR +cgR6eeDYp8plTw//e9dSn1u/6ArnQ4QAoZP8Q6MfJMABgg07lltRIQYiXnUNPE4c +xzMQ6kxbKLBi2VyeKm/mQ5oO6PH+59Lw0Q1YhchAXCO171fx2s4W2UGcIjdNbyhs +My5iSEICwXQQgAvTEC08An8aYi5waEpQ1fnnkQcawTgRoBL2gMNsQOkZdERbJr2X +zNJfLwGoDnNJTD8V4FCAeHieOAqmlGsqRc7mKPq2EVW7GH6vzWBJbZc71rmk7EwY +2zvpR9aFam71ivmFgLYwLrRef3vd+AGbIc2WOcIADJ9JIa6HF1gK8LSym/t+/2ws +fQ1FHpjHmYZICJqac1SQ6KZhMz9q35yKqBSaNmiv+mXBg7W6Jfckjg8mGgxvTdL+ +VDRDlK9K6bxClwIVAPd9bTMe17hl3ipR0X6O2UOmt799AoICABPfIvExHzdmJK+G +kx+o28PNNw9ZAte2RxZWm8b0m9MW+jdeWDrhGbbk7nVJn6i6xaaRgJDWuZnKUQbC +0WwjOm9fXnjBmnQhacJu0RGyr/b+akzZ4Y/7N+SBxRjasLVTFd+msQ2NE1PkXps5 +rhJWVMu9R9xp0qR/e+rh/Cax7nSq5UNAqSy9gzHkOhjS7s6UJ1yfCEO5Xfcvb7ND +RpLIeBYbLT3OSkSd6kkFvMtb0Sl/WZ7z88flkdNGbutAcJVQzBcfQIwCuXyOYzUr +8TcIB5j4c19MN9yfkykgemieC0uz/xzgtZt6g6bFfQNONmJ0YGoEPkz1GftI6dx/ +324vh4KhLfBjKDKFB8Pt9JKI9nQA7P10GlwWeA+IpSTzjlJq3x35u220K7tc/5xr +TDMEftBemn/dvb/bJ9h+iSciZ7EcnN2RXB7SfykUAohE9DdEUlmjip6DYLP+hSN2 +oHiVmDVjv3XEGYQfATuxQmwcveHTYZmPId8XF2wkGiy6w0BY0NN+4oEuZga4YvEK +3MVF2VEzM0onFzNgszwb+KaUfcA+eycthidca+sJzmOGAMWCx/vydNryMcWVXABF +IRxbZVaXHCWf1RhAf0jcsiz9+JIuScAB2J26Oy2shPGOmesvuUHeUTqzvEJ2G77j +k9Mps+1fbzySKX3PQEwA/qQ11qT6A4ICBQACggIAbDXVjXtIxAM4TSt9FSep+H1j +yRoEXgisf5Q6eU6I7Wf6kAoW6bHw76S/OHgcMBYX7Z42kbVbna/rIAVfHnfrAaZY +ygYVqbxTKdhi0c8IxR2qyF9Z5UK68C/EP0SHjHJrFRAnYgwkqvJXbemHFB4c0Ds1 +iIL47Kas8o/WvLpT1VzlHXFyFKvRxNMdeJsy8/LBSrQpRUiKcJFM2lg+O8cNWsRd +kHTeWnjLrZT2rpPUIkSQZdbR16VBI8nS4pYpzdZ/N2zy+2S5dup7jMNtnLbXVT3X +AjSjiYHRZPQUnX0pG3qA0BzDuA0U3MdBs8Wf7YhGd8XLbAfdo5zPSM9GimJrGH0s +q4XKLHAEXUPfSuDGOdG8l990MujcRrewocwX5La1X/Nc4TDClCPUOVbf1aqy7LXY +TB1M+nHvTb5HhtIrZYSHmsdpWlcLj5mYde/nvFXmNu3RNVCLhMzQDV9S/U1hqNcH +m/BX2VTJ0xqhFIlA5UVrKZpnAEISKcFjwmZo7GuA1ENw2vhuvswjfYQ3OMfEr258 +0b1tKNMWrkbCgHdALjT/VdRUtte7RyGvsMccUHu6MHPowFRxbT3lWUqj1LKdZYnT +uERL4E1J2VIP1/x2upPPWl/wbQjxplsRQrSY+cQCfWM22Wtilouh+CdEc+1DNKs/ +bKZWFUcty/GYmXtxTTk= +-----END PUBLIC KEY----- diff --git a/Frameworks/Sparkle/Vendor/CocoatechCore/NTSynchronousTask.h b/Frameworks/Sparkle/Vendor/CocoatechCore/NTSynchronousTask.h new file mode 100644 index 000000000..cbcbf2c80 --- /dev/null +++ b/Frameworks/Sparkle/Vendor/CocoatechCore/NTSynchronousTask.h @@ -0,0 +1,26 @@ +// +// NTSynchronousTask.h +// CocoatechCore +// +// Created by Steve Gehrman on 9/29/05. +// Copyright 2005 Steve Gehrman. All rights reserved. +// + +#ifndef NTSYNCHRONOUSTASK_H +#define NTSYNCHRONOUSTASK_H + +@interface NTSynchronousTask : NSObject +@property (readonly, strong) NSData *output; +@property (readonly) int result; + +// pass nil for directory if not needed +// returns the result ++(int) task:(NSString*)toolPath directory:(NSString*)currentDirectory withArgs:(NSArray*)args input:(NSData*)input output: (NSData**)outData; + ++(NSData*)task:(NSString*)toolPath directory:(NSString*)currentDirectory withArgs:(NSArray*)args input:(NSData*)input; + +- (void)run:(NSString*)toolPath directory:(NSString*)currentDirectory withArgs:(NSArray*)args input:(NSData*)input; + +@end + +#endif diff --git a/Frameworks/Sparkle/Vendor/CocoatechCore/NTSynchronousTask.m b/Frameworks/Sparkle/Vendor/CocoatechCore/NTSynchronousTask.m new file mode 100644 index 000000000..b0fdee24e --- /dev/null +++ b/Frameworks/Sparkle/Vendor/CocoatechCore/NTSynchronousTask.m @@ -0,0 +1,174 @@ +// +// NTSynchronousTask.m +// CocoatechCore +// +// Created by Steve Gehrman on 9/29/05. +// Copyright 2005 Steve Gehrman. All rights reserved. +// + +#import "SUUpdater.h" + +#import "SUAppcast.h" +#import "SUAppcastItem.h" +#import "SUVersionComparisonProtocol.h" +#import "NTSynchronousTask.h" + +@interface NTSynchronousTask () +@property (strong) NSTask *task; +@property (strong) NSPipe *outputPipe; +@property (strong) NSPipe *inputPipe; +@property (readwrite, strong) NSData *output; +@property (getter = isDone) BOOL done; +@property (readwrite) int result; +@end + +@implementation NTSynchronousTask +@synthesize output = mv_output; +@synthesize result = mv_result; +@synthesize task = mv_task; +@synthesize outputPipe = mv_outputPipe; +@synthesize inputPipe = mv_inputPipe; +@synthesize done = mv_done; + +- (void)taskOutputAvailable:(NSNotification*)note +{ + self.output = [note userInfo][NSFileHandleNotificationDataItem]; + + self.done = YES; +} + +- (void)taskDidTerminate:(NSNotification *) __unused note +{ + self.result = [self.task terminationStatus]; +} + +- (instancetype)init +{ + self = [super init]; + if (self) + { + self.task = [[NSTask alloc] init]; + self.outputPipe = [[NSPipe alloc] init]; + self.inputPipe = [[NSPipe alloc] init]; + + self.task.standardInput = self.inputPipe; + self.task.standardOutput = self.outputPipe; + self.task.standardError = self.outputPipe; + } + + return self; +} + +//---------------------------------------------------------- +// dealloc +//---------------------------------------------------------- +- (void)dealloc +{ + [[NSNotificationCenter defaultCenter] removeObserver:self]; +} + +- (void)run:(NSString*)toolPath directory:(NSString*)currentDirectory withArgs:(NSArray*)args input:(NSData*)input +{ + BOOL success = NO; + + if (currentDirectory) { + self.task.currentDirectoryPath = currentDirectory; + } + + self.task.launchPath = toolPath; + self.task.arguments = args; + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(taskOutputAvailable:) + name:NSFileHandleReadToEndOfFileCompletionNotification + object:[[self outputPipe] fileHandleForReading]]; + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(taskDidTerminate:) + name:NSTaskDidTerminateNotification + object:[self task]]; + + [[[self outputPipe] fileHandleForReading] readToEndOfFileInBackgroundAndNotifyForModes:@[NSDefaultRunLoopMode, NSModalPanelRunLoopMode, NSEventTrackingRunLoopMode]]; + + @try + { + [self.task launch]; + success = YES; + } + @catch (NSException *) { } + + if (success) + { + if (input) + { + // feed the running task our input + [[self.inputPipe fileHandleForWriting] writeData:input]; + [[self.inputPipe fileHandleForWriting] closeFile]; + } + + // loop until we are done receiving the data + if (!self.done) + { + double resolution = 1; + BOOL isRunning; + NSDate* next; + + do { + next = [NSDate dateWithTimeIntervalSinceNow:resolution]; + + isRunning = [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode + beforeDate:next]; + } while (isRunning && !self.done); + } + } +} + ++ (NSData*)task:(NSString*)toolPath directory:(NSString*)currentDirectory withArgs:(NSArray*)args input:(NSData*)input +{ + @autoreleasepool { + NSData* result = nil; + // we need this wacky pool here, otherwise we run out of pipes, the pipes are internally autoreleased + @try { + NTSynchronousTask* task = [[NTSynchronousTask alloc] init]; + + [task run:toolPath directory:currentDirectory withArgs:args input:input]; + + if ([task result] == 0) { + result = [task output]; + } + } + @catch (NSException *) { } + + return result; + } +} + + ++(int) task:(NSString*)toolPath directory:(NSString*)currentDirectory withArgs:(NSArray*)args input:(NSData*)input output: (NSData*__autoreleasing *)outData +{ + // we need this wacky pool here, otherwise we run out of pipes, the pipes are internally autoreleased + @autoreleasepool { + int taskResult = 0; + if (outData) { + *outData = nil; + } + + @try { + NTSynchronousTask* task = [[NTSynchronousTask alloc] init]; + + [task run:toolPath directory:currentDirectory withArgs:args input:input]; + + taskResult = [task result]; + if (outData) { + *outData = [task output]; + } + + } @catch (NSException *) { + taskResult = errCppGeneral; + } + + return taskResult; + } +} + +@end diff --git a/Frameworks/Sparkle/Vendor/bsdiff/bsdiff.c b/Frameworks/Sparkle/Vendor/bsdiff/bsdiff.c new file mode 100644 index 000000000..a742ea974 --- /dev/null +++ b/Frameworks/Sparkle/Vendor/bsdiff/bsdiff.c @@ -0,0 +1,501 @@ +/*- + * Copyright 2003 - 2005 Colin Percival + * All rights reserved + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted providing that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#if 0 +__FBSDID("$FreeBSD: src/usr.bin/bsdiff/bsdiff/bsdiff.c, v 1.1 2005/08/06 01:59:05 cperciva Exp $"); +#endif + +#include + +#include +#include +#include +#include +#include +#include + +#define MIN(x, y) (((x)<(y)) ? (x) : (y)) + +static void split(off_t *I, off_t *V, off_t start, off_t len, off_t h) +{ + off_t i, j, k, x, tmp, jj, kk; + + if (len < 16) { + for (k = start; k < start + len; k += j) { + j = 1; x = V[I[k] + h]; + for (i = 1; k + i < start + len; i++) { + if (V[I[k + i] + h] < x) { + x = V[I[k + i] + h]; + j = 0; + }; + if (V[I[k + i] + h] == x) { + tmp = I[k + j]; I[k + j] = I[k + i]; I[k + i] = tmp; + j++; + }; + }; + for (i = 0; i < j; i++) + V[I[k + i]] = k + j - 1; + if (j == 1) + I[k] = -1; + }; + return; + }; + + x = V[I[start + len/2] + h]; + jj = 0; kk = 0; + for (i = start; i < start + len; i++) { + if (V[I[i] + h] < x) + jj++; + if (V[I[i] + h] == x) + kk++; + }; + jj += start; kk += jj; + + i = start; j = 0; k = 0; + while (i < jj) { + if (V[I[i] + h] < x) { + i++; + } else if (V[I[i] + h] == x) { + tmp = I[i]; I[i] = I[jj + j]; I[jj + j] = tmp; + j++; + } else { + tmp = I[i]; I[i] = I[kk + k]; I[kk + k] = tmp; + k++; + }; + }; + + while (jj + j < kk) { + if (V[I[jj + j] + h] == x) { + j++; + } else { + tmp = I[jj + j]; I[jj + j] = I[kk + k]; I[kk + k] = tmp; + k++; + }; + }; + + if (jj > start) + split(I, V, start, jj - start, h); + + for (i = 0; i < kk - jj; i++) + V[I[jj + i]] = kk - 1; + if (jj == kk - 1) + I[jj] = -1; + + if (start + len > kk) + split(I, V, kk, start + len - kk, h); +} + +/* qsufsort(I, V, old, oldsize) + * + * Computes the suffix sort of the string at 'old' and stores the resulting + * indices in 'I', using 'V' as a temporary array for the computation. */ +static void qsufsort(off_t *I, off_t *V, u_char *old, off_t oldsize) +{ + off_t buckets[256]; + off_t i, h, len; + + /* count number of each byte */ + for (i = 0; i < 256; i++) + buckets[i] = 0; + for (i = 0; i < oldsize; i++) + buckets[old[i]]++; + /* make buckets cumulative */ + for (i = 1; i < 256; i++) + buckets[i] += buckets[i - 1]; + /* shift right by one */ + for (i = 255; i > 0; i--) + buckets[i] = buckets[i - 1]; + buckets[0] = 0; + /* at this point, buckets[c] is the number of bytes in the old file with + * value less than c. */ + + /* set up the sort order of the suffixes based solely on the first + * character */ + for (i = 0; i < oldsize; i++) + I[++buckets[old[i]]] = i; + I[0] = oldsize; + /* ? */ + for (i = 0; i < oldsize; i++) + V[i] = buckets[old[i]]; + V[oldsize] = 0; + /* forward any entries in the ordering which have the same initial + * character */ + for (i = 1; i < 256; i++) { + if (buckets[i] == buckets[i - 1] + 1) + I[buckets[i]] = -1; + } + I[0] = -1; + + for (h = 1; I[0] != -(oldsize + 1); h += h) { + len = 0; + for (i = 0; i < oldsize + 1;) { + if (I[i] < 0) { + len -= I[i]; + i -= I[i]; + } else { + if (len) + I[i - len] = -len; + len = V[I[i]] + 1 - i; + split(I, V, i, len, h); + i += len; + len = 0; + } + } + if (len) + I[i - len] = -len; + }; + + for (i = 0; i < oldsize + 1; i++) I[V[i]] = i; +} + +/* matchlen(old, oldsize, new, newsize) + * + * Returns the length of the longest common prefix between 'old' and 'new'. */ +static off_t matchlen(u_char *old, off_t oldsize, u_char *new, off_t newsize) +{ + off_t i; + + for (i = 0; (i < oldsize) && (i < newsize); i++) + { + if (old[i] != new[i]) + break; + } + + return i; +} + +/* search(I, old, oldsize, new, newsize, st, en, pos) + * + * Searches for the longest prefix of 'new' that occurs in 'old', stores its + * offset in '*pos', and returns its length. 'I' should be the suffix sort of + * 'old', and 'st' and 'en' are the lowest and highest indices in the suffix + * sort to consider. If you're searching all suffixes, 'st = 0' and 'en = + * oldsize - 1'. */ +static off_t search(off_t *I, u_char *old, off_t oldsize, + u_char *new, off_t newsize, off_t st, off_t en, off_t *pos) +{ + off_t x, y; + + if (en - st < 2) { + x = matchlen(old + I[st], oldsize - I[st], new, newsize); + y = matchlen(old + I[en], oldsize - I[en], new, newsize); + + if (x > y) { + *pos = I[st]; + return x; + } else { + *pos = I[en]; + return y; + } + } + + x = st + (en - st)/2; + if (memcmp(old + I[x], new, MIN(oldsize - I[x], newsize)) < 0) { + return search(I, old, oldsize, new, newsize, x, en, pos); + } else { + return search(I, old, oldsize, new, newsize, st, x, pos); + }; +} + +/* offtout(x, buf) + * + * Writes the off_t 'x' portably to the array 'buf'. */ +static void offtout(off_t x, u_char *buf) +{ + off_t y; + + if (x < 0) + y = -x; + else + y = x; + + buf[0] = y % 256; + y -= buf[0]; + y = y/256; buf[1] = y%256; y -= buf[1]; + y = y/256; buf[2] = y%256; y -= buf[2]; + y = y/256; buf[3] = y%256; y -= buf[3]; + y = y/256; buf[4] = y%256; y -= buf[4]; + y = y/256; buf[5] = y%256; y -= buf[5]; + y = y/256; buf[6] = y%256; y -= buf[6]; + y = y/256; buf[7] = y%256; + + if (x < 0) + buf[7] |= 0x80; +} + +int bsdiff(int argc, char *argv[]); // Added by AMM: suppresses a warning about the following not having a prototype. + +int bsdiff(int argc, char *argv[]) +{ + int fd; + u_char *old,*new; /* contents of old, new files */ + off_t oldsize, newsize; /* length of old, new files */ + off_t *I,*V; /* arrays used for suffix sort; I is ordering */ + off_t scan; /* position of current match in old file */ + off_t pos; /* position of current match in new file */ + off_t len; /* length of current match */ + off_t lastscan; /* position of previous match in old file */ + off_t lastpos; /* position of previous match in new file */ + off_t lastoffset; /* lastpos - lastscan */ + off_t oldscore, scsc; /* temp variables in match search */ + off_t s, Sf, lenf, Sb, lenb; /* temp vars in match extension */ + off_t overlap, Ss, lens; + off_t i; + off_t dblen, eblen; /* length of diff, extra sections */ + u_char *db,*eb; /* contents of diff, extra sections */ + u_char buf[8]; + u_char header[32]; + FILE * pf; + + if (argc != 4) + errx(1,"usage: %s oldfile newfile patchfile\n", argv[0]); + + /* Allocate oldsize + 1 bytes instead of oldsize bytes to ensure + that we never try to malloc(0) and get a NULL pointer */ + if (((fd = open(argv[1], O_RDONLY, 0)) < 0) || + ((oldsize = lseek(fd, 0, SEEK_END)) == -1) || + ((old = malloc(oldsize + 1)) == NULL) || + (lseek(fd, 0, SEEK_SET) != 0) || + (read(fd, old, oldsize) != oldsize) || + (close(fd) == -1)) + err(1,"%s", argv[1]); + + if (((I = malloc((oldsize + 1) * sizeof(off_t))) == NULL) || + ((V = malloc((oldsize + 1) * sizeof(off_t))) == NULL)) + err(1, NULL); + + /* Do a suffix sort on the old file. */ + qsufsort(I, V, old, oldsize); + + free(V); + + /* Allocate newsize + 1 bytes instead of newsize bytes to ensure + that we never try to malloc(0) and get a NULL pointer */ + if (((fd = open(argv[2], O_RDONLY, 0)) < 0) || + ((newsize = lseek(fd, 0, SEEK_END)) == -1) || + ((new = malloc(newsize + 1)) == NULL) || + (lseek(fd, 0, SEEK_SET) != 0) || + (read(fd, new, newsize) != newsize) || + (close(fd) == -1)) + err(1,"%s", argv[2]); + + if (((db = malloc(newsize + 1)) == NULL) || + ((eb = malloc(newsize + 1)) == NULL)) + err(1, NULL); + dblen = 0; + eblen = 0; + + /* Create the patch file */ + if ((pf = fopen(argv[3], "w")) == NULL) + err(1, "%s", argv[3]); + + /* Header is + 0 8 "BSDIFN40" + 8 8 length of ctrl block + 16 8 length of diff block + 24 8 length of new file */ + /* File is + 0 32 Header + 32 ?? ctrl block + ?? ?? diff block + ?? ?? extra block */ + memcpy(header, "BSDIFN40", 8); + offtout(0, header + 8); + offtout(0, header + 16); + offtout(newsize, header + 24); + if (fwrite(header, 32, 1, pf) != 1) + err(1, "fwrite(%s)", argv[3]); + + /* Compute the differences, writing ctrl as we go */ + scan = 0; + len = 0; + lastscan = 0; + lastpos = 0; + lastoffset = 0; + while (scan < newsize) { + oldscore = 0; + + for (scsc = scan += len; scan < newsize; scan++) { + /* 'oldscore' is the number of characters that match between the + * substrings 'old[lastoffset + scan:lastoffset + scsc]' and + * 'new[scan:scsc]'. */ + len = search(I, old, oldsize, new + scan, newsize - scan, + 0, oldsize, &pos); + + /* If this match extends further than the last one, add any new + * matching characters to 'oldscore'. */ + for (; scsc < scan + len; scsc++) { + if ((scsc + lastoffset < oldsize) && + (old[scsc + lastoffset] == new[scsc])) + oldscore++; + } + + /* Choose this as our match if it contains more than eight + * characters that would be wrong if matched with a forward + * extension of the previous match instead. */ + if (((len == oldscore) && (len != 0)) || + (len > oldscore + 8)) + break; + + /* Since we're advancing 'scan' by 1, remove the character under it + * from 'oldscore' if it matches. */ + if ((scan + lastoffset < oldsize) && + (old[scan + lastoffset] == new[scan])) + oldscore--; + } + + /* Skip this section if we found an exact match that would be + * better serviced by a forward extension of the previous match. */ + if ((len != oldscore) || (scan == newsize)) { + /* Figure out how far forward the previous match should be + * extended... */ + s = 0; + Sf = 0; + lenf = 0; + for (i = 0; (lastscan + i < scan) && (lastpos + i < oldsize);) { + if (old[lastpos + i] == new[lastscan + i]) + s++; + i++; + if (s * 2 - i > Sf * 2 - lenf) { + Sf = s; + lenf = i; + } + } + + /* ... and how far backwards the next match should be extended. */ + lenb = 0; + if (scan < newsize) { + s = 0; + Sb = 0; + for (i = 1; (scan >= lastscan + i) && (pos >= i); i++) { + if (old[pos - i] == new[scan - i]) + s++; + if (s * 2 - i > Sb * 2 - lenb) { + Sb = s; + lenb = i; + } + } + } + + /* If there is an overlap between the extensions, find the best + * dividing point in the middle and reset 'lenf' and 'lenb' + * accordingly. */ + if (lastscan + lenf > scan - lenb) { + overlap = (lastscan + lenf) - (scan - lenb); + s = 0; + Ss = 0; + lens = 0; + for (i = 0; i < overlap; i++) { + if (new[lastscan + lenf - overlap + i] == + old[lastpos + lenf - overlap + i]) + s++; + if (new[scan - lenb + i] == old[pos - lenb + i]) + s--; + if (s > Ss) { + Ss = s; + lens = i + 1; + } + } + + lenf += lens - overlap; + lenb -= lens; + } + + /* Write the diff data for the last match to the diff section... */ + for (i = 0; i < lenf; i++) + db[dblen + i] = new[lastscan + i] - old[lastpos + i]; + /* ... and, if there's a gap between the extensions just + * calculated, write the data in that gap to the extra section. */ + for (i = 0; i< (scan - lenb) - (lastscan + lenf); i++) + eb[eblen + i] = new[lastscan + lenf + i]; + + /* Update the diff and extra section lengths accordingly. */ + dblen += lenf; + eblen += (scan - lenb) - (lastscan + lenf); + + /* Write the following triple of integers to the control section: + * - length of the diff + * - length of the extra section + * - offset between the end of the diff and the start of the next + * diff, in the old file + */ + offtout(lenf, buf); + if (fwrite(buf, 8, 1, pf) != 1) + errx(1, "fwrite"); + + offtout((scan - lenb) - (lastscan + lenf), buf); + if (fwrite(buf, 8, 1, pf) != 1) + err(1, "fwrite"); + + offtout((pos - lenb) - (lastpos + lenf), buf); + if (fwrite(buf, 8, 1, pf) != 1) + err(1, "fwrite"); + + /* Update the variables describing the last match. Note that + * 'lastscan' is set to the start of the current match _after_ the + * backwards extension; the data in that extension will be written + * in the next pass. */ + lastscan = scan - lenb; + lastpos = pos - lenb; + lastoffset = pos - scan; + } + } + + /* Compute size of compressed ctrl data */ + if ((len = ftello(pf)) == -1) + err(1, "ftello"); + offtout(len - 32, header + 8); + + /* Write diff data */ + if (dblen && fwrite(db, dblen, 1, pf) != 1) + err(1, "fwrite"); + + /* Compute size of compressed diff data */ + if ((newsize = ftello(pf)) == -1) + err(1, "ftello"); + offtout(newsize - len, header + 16); + + /* Write extra data */ + if (eblen && fwrite(eb, eblen, 1, pf) != 1) + err(1, "fwrite"); + + /* Seek to the beginning, write the header, and close the file */ + if (fseeko(pf, 0, SEEK_SET)) + err(1, "fseeko"); + if (fwrite(header, 32, 1, pf) != 1) + err(1, "fwrite(%s)", argv[3]); + if (fclose(pf)) + err(1, "fclose"); + + /* Free the memory we used */ + free(db); + free(eb); + free(I); + free(old); + free(new); + + return 0; +} diff --git a/Frameworks/Sparkle/Vendor/bsdiff/bspatch.c b/Frameworks/Sparkle/Vendor/bsdiff/bspatch.c new file mode 100644 index 000000000..d1f8ce943 --- /dev/null +++ b/Frameworks/Sparkle/Vendor/bsdiff/bspatch.c @@ -0,0 +1,271 @@ +/*- + * Copyright 2003-2005 Colin Percival + * All rights reserved + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted providing that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#if 0 +__FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59:06 cperciva Exp $"); +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +/* Compatibility layer for reading either the old BSDIFF40 or the new BSDIFN40 + patch formats: */ + +typedef void* stream_t; + +typedef struct +{ + stream_t (*open)(FILE*); + void (*close)(stream_t); + int (*read)(stream_t, void*, int); +} io_funcs_t; + +static stream_t BSDIFF40_open(FILE *f) +{ + int bzerr; + BZFILE *s; + if ((s = BZ2_bzReadOpen(&bzerr, f, 0, 0, NULL, 0)) == NULL) + errx(1, "BZ2_bzReadOpen, bz2err = %d", bzerr); + return s; +} + +static void BSDIFF40_close(stream_t s) +{ + int bzerr; + BZ2_bzReadClose(&bzerr, (BZFILE*)s); +} + +static int BSDIFF40_read(stream_t s, void *buf, int len) +{ + int bzerr, lenread; + lenread = BZ2_bzRead(&bzerr, (BZFILE*)s, buf, len); + if (bzerr != BZ_OK && bzerr != BZ_STREAM_END) + errx(1, "Corrupt patch\n"); + return lenread; +} + +static io_funcs_t BSDIFF40_funcs = { + BSDIFF40_open, + BSDIFF40_close, + BSDIFF40_read +}; + + +static stream_t BSDIFN40_open(FILE *f) +{ + return f; +} + +static void BSDIFN40_close(stream_t s) +{ +} + +static int BSDIFN40_read(stream_t s, void *buf, int len) +{ + return fread(buf, 1, len, (FILE*)s); +} + +static io_funcs_t BSDIFN40_funcs = { + BSDIFN40_open, + BSDIFN40_close, + BSDIFN40_read +}; + + +#ifndef u_char +typedef unsigned char u_char; +#endif + +static off_t offtin(u_char *buf) +{ + off_t y; + + y=buf[7]&0x7F; + y=y*256;y+=buf[6]; + y=y*256;y+=buf[5]; + y=y*256;y+=buf[4]; + y=y*256;y+=buf[3]; + y=y*256;y+=buf[2]; + y=y*256;y+=buf[1]; + y=y*256;y+=buf[0]; + + if(buf[7]&0x80) y=-y; + + return y; +} + +int bspatch(int argc,char * argv[]) +{ + FILE * f, * cpf, * dpf, * epf; + stream_t cstream, dstream, estream; + int fd; + ssize_t oldsize,newsize; + ssize_t bzctrllen,bzdatalen; + u_char header[32],buf[8]; + u_char *old, *new; + off_t oldpos,newpos; + off_t ctrl[3]; + off_t lenread; + off_t i; + io_funcs_t * io; + + if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]); + + /* Open patch file */ + if ((f = fopen(argv[3], "r")) == NULL) + err(1, "fopen(%s)", argv[3]); + + /* + File format: + 0 8 "BSDIFF40" (bzip2) or "BSDIFN40" (raw) + 8 8 X + 16 8 Y + 24 8 sizeof(newfile) + 32 X bzip2(control block) + 32+X Y bzip2(diff block) + 32+X+Y ??? bzip2(extra block) + with control block a set of triples (x,y,z) meaning "add x bytes + from oldfile to x bytes from the diff block; copy y bytes from the + extra block; seek forwards in oldfile by z bytes". + */ + + /* Read header */ + if (fread(header, 1, 32, f) < 32) { + if (feof(f)) + errx(1, "Corrupt patch\n"); + err(1, "fread(%s)", argv[3]); + } + + /* Check for appropriate magic */ + if (memcmp(header, "BSDIFF40", 8) == 0) + io = &BSDIFF40_funcs; + else if (memcmp(header, "BSDIFN40", 8) == 0) + io = &BSDIFN40_funcs; + else + errx(1, "Corrupt patch\n"); + + /* Read lengths from header */ + bzctrllen=offtin(header+8); + bzdatalen=offtin(header+16); + newsize=offtin(header+24); + if((bzctrllen<0) || (bzdatalen<0) || (newsize<0)) + errx(1,"Corrupt patch\n"); + + /* Close patch file and re-open it via libbzip2 at the right places */ + if (fclose(f)) + err(1, "fclose(%s)", argv[3]); + if ((cpf = fopen(argv[3], "r")) == NULL) + err(1, "fopen(%s)", argv[3]); + if (fseeko(cpf, 32, SEEK_SET)) + err(1, "fseeko(%s, %lld)", argv[3], + (long long)32); + cstream = io->open(cpf); + if ((dpf = fopen(argv[3], "r")) == NULL) + err(1, "fopen(%s)", argv[3]); + if (fseeko(dpf, 32 + bzctrllen, SEEK_SET)) + err(1, "fseeko(%s, %lld)", argv[3], + (long long)(32 + bzctrllen)); + dstream = io->open(dpf); + if ((epf = fopen(argv[3], "r")) == NULL) + err(1, "fopen(%s)", argv[3]); + if (fseeko(epf, 32 + bzctrllen + bzdatalen, SEEK_SET)) + err(1, "fseeko(%s, %lld)", argv[3], + (long long)(32 + bzctrllen + bzdatalen)); + estream = io->open(epf); + + if(((fd=open(argv[1],O_RDONLY,0))<0) || + ((oldsize=lseek(fd,0,SEEK_END))==-1) || + ((old=malloc(oldsize+1))==NULL) || + (lseek(fd,0,SEEK_SET)!=0) || + (read(fd,old,oldsize)!=oldsize) || + (close(fd)==-1)) err(1,"%s",argv[1]); + if((new=malloc(newsize+1))==NULL) err(1,NULL); + + oldpos=0;newpos=0; + while(newposread(cstream, buf, 8); + if (lenread < 8) + errx(1, "Corrupt patch\n"); + ctrl[i]=offtin(buf); + }; + + /* Sanity-check */ + if(newpos+ctrl[0]>newsize) + errx(1,"Corrupt patch\n"); + + /* Read diff string */ + lenread = io->read(dstream, new + newpos, ctrl[0]); + if (lenread < ctrl[0]) + errx(1, "Corrupt patch\n"); + + /* Add old data to diff string */ + for(i=0;i=0) && (oldpos+inewsize) + errx(1,"Corrupt patch\n"); + + /* Read extra string */ + lenread = io->read(estream, new + newpos, ctrl[1]); + if (lenread < ctrl[1]) + errx(1, "Corrupt patch\n"); + + /* Adjust pointers */ + newpos+=ctrl[1]; + oldpos+=ctrl[2]; + }; + + /* Clean up the bzip2 reads */ + io->close(cstream); + io->close(dstream); + io->close(estream); + if (fclose(cpf) || fclose(dpf) || fclose(epf)) + err(1, "fclose(%s)", argv[3]); + + /* Write the new file */ + if(((fd=open(argv[2],O_CREAT|O_TRUNC|O_WRONLY,0666))<0) || + (write(fd,new,newsize)!=newsize) || (close(fd)==-1)) + err(1,"%s",argv[2]); + + free(new); + free(old); + + return 0; +} diff --git a/Frameworks/Sparkle/Vendor/bsdiff/bspatch.h b/Frameworks/Sparkle/Vendor/bsdiff/bspatch.h new file mode 100644 index 000000000..f9bb672f5 --- /dev/null +++ b/Frameworks/Sparkle/Vendor/bsdiff/bspatch.h @@ -0,0 +1,12 @@ +/* + * bspatch.h + * Sparkle + * + * Created by Andy Matuschak on 1/11/10. + * Copyright 2010 Andy Matuschak. All rights reserved. + * + */ + +// So that we can use this method in SUBinaryDeltaApply.m. +// Silences the GCC warning that the prototype doesn't exist. +int bspatch(int argc, char * argv[]); diff --git a/Frameworks/Sparkle/bin/generate_keys.sh b/Frameworks/Sparkle/bin/generate_keys.sh new file mode 100755 index 000000000..4666fbb0a --- /dev/null +++ b/Frameworks/Sparkle/bin/generate_keys.sh @@ -0,0 +1,21 @@ +#!/bin/bash +set -e +for file in "dsaparam.pem" "dsa_priv.pem" "dsa_pub.pem"; do + if [ -e "$file" ]; then + echo "There's already a $file here! Move it aside or be more careful!" + exit 1 + fi +done + +openssl="/usr/bin/openssl" +$openssl gendsa <($openssl dsaparam 4096) -out dsa_priv.pem +chmod 0400 dsa_priv.pem +$openssl dsa -in dsa_priv.pem -pubout -out dsa_pub.pem +chmod 0444 dsa_pub.pem + +echo " +Generated private and public keys: dsa_priv.pem and dsa_pub.pem. +BACK UP YOUR PRIVATE KEY AND KEEP IT SAFE! +If you lose it, your users will be unable to upgrade!" + +open -R dsa_priv.pem diff --git a/Frameworks/Sparkle/bin/sign_update.sh b/Frameworks/Sparkle/bin/sign_update.sh new file mode 100755 index 000000000..7c4399908 --- /dev/null +++ b/Frameworks/Sparkle/bin/sign_update.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e +set -o pipefail +if [ "$#" -ne 2 ]; then + echo "Usage: $0 update_archive private_key" + exit 1 +fi +openssl=/usr/bin/openssl +$openssl dgst -sha1 -binary < "$1" | $openssl dgst -dss1 -sign "$2" | $openssl enc -base64