mirror of
https://github.com/sparkle-project/Sparkle
synced 2026-11-22 04:30:47 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ab7d712912 | ||
|
|
6e5f706ad2 | ||
|
|
0d7b776213 | ||
|
|
bd355af936 | ||
|
|
6cf88c720d | ||
|
|
8287d2ff29 | ||
|
|
a8a8c371f5 | ||
|
|
4f757ee330 | ||
|
|
15b79334ac | ||
|
|
93265664de | ||
|
|
eef1a539a3 | ||
|
|
19041aaa4f | ||
|
|
c98fe67b3f | ||
|
|
89f135b438 | ||
|
|
3c28a554cd | ||
|
|
bb91fffa5d | ||
|
|
5f2b248e3e | ||
|
|
5fc946b35e | ||
|
|
39c97c96e6 | ||
|
|
c9afdf87a2 | ||
|
|
8ecff1d99c | ||
|
|
e0f80730c7 | ||
|
|
07c631ca99 | ||
|
|
4d95137122 | ||
|
|
164f2fd30f | ||
|
|
cb2c83e200 | ||
|
|
180b46555d | ||
|
|
91ac4bbe81 | ||
|
|
14d644c781 | ||
|
|
3ca274e711 | ||
|
|
b7b02e4929 | ||
|
|
3edaeee785 | ||
|
|
db50933867 | ||
|
|
8b73733ac2 | ||
|
|
dcfe48d282 | ||
|
|
57dc6e0138 | ||
|
|
cfa1190509 | ||
|
|
f6b2bf3814 | ||
|
|
59e2f8779d | ||
|
|
303db88948 | ||
|
|
c7f635dc24 | ||
|
|
4a84bf2108 | ||
|
|
63e2e40934 | ||
|
|
a741b7c539 | ||
|
|
4d19b90bd4 | ||
|
|
9c8b94c3cb | ||
|
|
e217de97a2 | ||
|
|
31b7654b5b | ||
|
|
d80452a6b4 | ||
|
|
d46d456107 | ||
|
|
00e7c24b6a | ||
|
|
e6a344a570 |
No files matched your search
@@ -1,4 +1,4 @@
|
||||
(Insert summary of your pull request here)
|
||||
(Insert summary of your pull request here. Major changes in functionality without prior discussion may be rejected.)
|
||||
|
||||
Fixes # (issue)
|
||||
|
||||
@@ -6,6 +6,7 @@ Fixes # (issue)
|
||||
|
||||
- [ ] My change requires a documentation update on [Sparkle's website repository](https://github.com/sparkle-project/sparkle-project.github.io)
|
||||
- [ ] My change requires changes to generate_appcast, generate_keys, or sign_update
|
||||
- [ ] My change was generated/assisted using AI and if so was reviewed by me in whole (explain in detail in the summary)
|
||||
|
||||
## Testing
|
||||
|
||||
|
||||
+19
-10
@@ -10,21 +10,21 @@ jobs:
|
||||
build:
|
||||
strategy:
|
||||
matrix:
|
||||
xcode: ['xcode26.2', 'xcode16.4']
|
||||
xcode: ['xcode26.6', 'xcode27.0']
|
||||
include:
|
||||
- xcode: 'xcode16.4'
|
||||
xcode-path: '/Applications/Xcode_16.4.app/Contents/Developer'
|
||||
- xcode: 'xcode27.0'
|
||||
xcode-path: '/Applications/Xcode_27.0.app/Contents/Developer'
|
||||
upload-dist: false
|
||||
run-analyzer: false
|
||||
macos: 'macos-15'
|
||||
- xcode: 'xcode26.2'
|
||||
xcode-path: '/Applications/Xcode_26.2.app/Contents/Developer'
|
||||
image: 'xcode-27'
|
||||
- xcode: 'xcode26.6'
|
||||
xcode-path: '/Applications/Xcode_26.6.app/Contents/Developer'
|
||||
upload-dist: true
|
||||
run-analyzer: true
|
||||
macos: 'macos-26'
|
||||
image: 'macos-26'
|
||||
|
||||
name: Build and Test Sparkle
|
||||
runs-on: ${{ matrix.macos }}
|
||||
runs-on: ${{ matrix.image }}
|
||||
|
||||
permissions:
|
||||
pull-requests: write
|
||||
@@ -35,6 +35,15 @@ jobs:
|
||||
with:
|
||||
submodules: true
|
||||
fetch-depth: 0
|
||||
- name: Check Installer Progress localizations are up to date
|
||||
if: ${{ matrix.upload-dist }}
|
||||
run: |
|
||||
python3 Configurations/generate_progress_tool_localizations.py
|
||||
if [ -n "$(git status --porcelain -- Sparkle/InstallerProgress/SPUInstallerProgressLocalizedStrings.h Sparkle/InstallerProgress/InstallerProgress-Info.plist)" ]; then
|
||||
echo "::error::Sparkle/InstallerProgress/SPUInstallerProgressLocalizedStrings.h or InstallerProgress-Info.plist is out of date. Run Configurations/generate_progress_tool_localizations.py and commit the result."
|
||||
git diff -- Sparkle/InstallerProgress/SPUInstallerProgressLocalizedStrings.h Sparkle/InstallerProgress/InstallerProgress-Info.plist
|
||||
exit 1
|
||||
fi
|
||||
- name: Build Unit Tests
|
||||
env:
|
||||
DEVELOPER_DIR: ${{ matrix.xcode-path }}
|
||||
@@ -99,7 +108,7 @@ jobs:
|
||||
xcodebuild build -project Sparkle.xcodeproj -scheme Distribution -configuration Release -derivedDataPath build
|
||||
- name: Archive Test Results
|
||||
if: failure()
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: build-logs
|
||||
path: |
|
||||
@@ -107,7 +116,7 @@ jobs:
|
||||
~/Library/Logs/DiagnosticReports
|
||||
- name: Upload Distribution
|
||||
if: ${{ success() && matrix.upload-dist }}
|
||||
uses: actions/upload-artifact@v4
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: Sparkle-distribution-${{ matrix.xcode }}.tar.xz
|
||||
path: build/Build/Products/Release/sparkle_dist.tar.xz
|
||||
@@ -2,7 +2,7 @@ name: "Create Draft Release"
|
||||
|
||||
env:
|
||||
BUILDDIR: "build"
|
||||
DEVELOPER_DIR: "/Applications/Xcode_26.2.app/Contents/Developer"
|
||||
DEVELOPER_DIR: "/Applications/Xcode_26.6.app/Contents/Developer"
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
@@ -481,9 +481,21 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
return;
|
||||
}
|
||||
|
||||
// Try to resolve the download URL from symlinks
|
||||
SUFileManager *fileManager = [[SUFileManager alloc] init];
|
||||
NSError *resolveError = nil;
|
||||
NSURL *resolvedDownloadURL = [fileManager resolveSymlinksInURL:downloadURL isDirectory:NO error:&resolveError];
|
||||
if (resolvedDownloadURL == nil) {
|
||||
SULogError(resolveError);
|
||||
|
||||
// Try to fallback onto regular downloadURL if resolving fails
|
||||
// Later file operations are performed safely even if the URL doesn't have symlinks resolved.
|
||||
resolvedDownloadURL = downloadURL;
|
||||
}
|
||||
|
||||
// Validate the download URL before moving it
|
||||
{
|
||||
NSArray<NSString *> *downloadURLPathComponents = downloadURL.URLByResolvingSymlinksInPath.pathComponents;
|
||||
NSArray<NSString *> *downloadURLPathComponents = resolvedDownloadURL.pathComponents;
|
||||
if (downloadURLPathComponents == nil) {
|
||||
[self cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to retrieve path components from download URL" }]];
|
||||
|
||||
@@ -546,12 +558,38 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
// This prevents eg: if a bug exists in the updater that removes files we are trying to install
|
||||
// When this tool is ran as root, we are moving it into a directory that only root will have access to
|
||||
|
||||
NSURL *downloadDestinationURL = [[NSURL fileURLWithPath:cacheInstallationPath] URLByAppendingPathComponent:downloadName];
|
||||
NSURL *cacheInstallationURL = [NSURL fileURLWithPath:cacheInstallationPath isDirectory:YES];
|
||||
|
||||
NSError *moveError = nil;
|
||||
if (![[[SUFileManager alloc] init] moveItemAtURL:downloadURL toURL:downloadDestinationURL error:&moveError]) {
|
||||
[self cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to move download archive to new location", NSUnderlyingErrorKey: moveError }]];
|
||||
return;
|
||||
NSError *resolvedCacheInstallationError = nil;
|
||||
NSURL *resolvedCacheInstallationURL = [fileManager resolveSymlinksInURL:cacheInstallationURL isDirectory:YES error:&resolvedCacheInstallationError];
|
||||
if (resolvedCacheInstallationURL == nil) {
|
||||
// Fallback to original cache installation URL if resolving fails
|
||||
SULogError(resolvedCacheInstallationError);
|
||||
resolvedCacheInstallationURL = cacheInstallationURL;
|
||||
}
|
||||
|
||||
NSURL *downloadDestinationURL = [resolvedCacheInstallationURL URLByAppendingPathComponent:downloadName isDirectory:NO];
|
||||
|
||||
BOOL fallbackToFileCopy;
|
||||
NSError *renameError = nil;
|
||||
if (![fileManager renameItemAtResolvedSymlinkURL:resolvedDownloadURL toResolvedSymlinkURL:downloadDestinationURL error:&renameError]) {
|
||||
SULog(SULogLevelError, @"Error: failed to rename '%@' to '%@'. Falling back to copy operation.", resolvedDownloadURL.path, downloadDestinationURL.path);
|
||||
|
||||
SULogError(renameError);
|
||||
|
||||
fallbackToFileCopy = YES;
|
||||
} else {
|
||||
fallbackToFileCopy = NO;
|
||||
}
|
||||
|
||||
if (fallbackToFileCopy) {
|
||||
// The client will be responsible for cleaning up the download.
|
||||
// We will not risk removing it here if rename failed. Copying the file is safer.
|
||||
NSError *copyError = nil;
|
||||
if (![fileManager copyItemAtURL:resolvedDownloadURL toURL:downloadDestinationURL error:©Error]) {
|
||||
[self cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to copy download archive to new location", NSUnderlyingErrorKey: copyError }]];
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Make sure the downloaded archive we moved over is a regular file and not a symbolic link placed by an attacker
|
||||
|
||||
@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_CLONE_LOOKUP 4
|
||||
#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_TOO_MANY_FILES 5
|
||||
#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_LINK_TOO_LONG 6
|
||||
#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_ITEM_INDEX 7
|
||||
|
||||
/*
|
||||
Modern container format for binary delta archives.
|
||||
|
||||
@@ -458,7 +458,12 @@ static compression_algorithm compressionAlgorithmForMode(SPUDeltaCompressionMode
|
||||
if (commands == SPUDeltaItemCommandEndMarker) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
if (currentItemIndex >= relativeFilePaths.count) {
|
||||
_error = [NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_ITEM_INDEX userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Item index %llu is past relative path table bounds of length %lu", currentItemIndex, (unsigned long)relativeFilePaths.count] }];
|
||||
break;
|
||||
}
|
||||
|
||||
// Check if we need to decode additional data
|
||||
uint16_t decodedMode = 0;
|
||||
uint64_t decodedDataLength = 0;
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#import <sys/stat.h>
|
||||
#include <sys/time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
@@ -173,7 +175,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
if (error != NULL) {
|
||||
*error = nil;
|
||||
}
|
||||
|
||||
|
||||
[archive enumerateItems:^(SPUDeltaArchiveItem *item, BOOL *stop) {
|
||||
NSString *relativePath = item.relativeFilePath;
|
||||
|
||||
@@ -229,8 +231,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
}
|
||||
}
|
||||
|
||||
// Don't use -[NSFileManager fileExistsAtPath:] because it will follow symbolic links
|
||||
BOOL fileExisted = verbose && [fileManager attributesOfItemAtPath:destinationFilePath error:nil];
|
||||
BOOL fileExisted = verbose && fileExists(destinationFilePath);
|
||||
BOOL removedFile = NO;
|
||||
|
||||
// Files that have no property set that we check for will get ignored
|
||||
@@ -293,7 +294,9 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Unable to extract diffed file to %@", tempDiffFile], NSUnderlyingErrorKey: (NSError * _Nonnull)archive.error }];
|
||||
}
|
||||
|
||||
|
||||
unlink(tempDiffFile.fileSystemRepresentation);
|
||||
|
||||
*stop = YES;
|
||||
return;
|
||||
}
|
||||
@@ -306,6 +309,9 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Relative path for clone '%@' contains '..' path component", clonedRelativePath] }];
|
||||
}
|
||||
|
||||
unlink(tempDiffFile.fileSystemRepresentation);
|
||||
|
||||
*stop = YES;
|
||||
return;
|
||||
}
|
||||
@@ -320,8 +326,18 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
// applyBinaryDeltaToFile() normally preserves file permissions on the file it's replacing.
|
||||
// However this is not possible if the destination file we're patching is not writable.
|
||||
// We also need to preserve permissions for clones except when we'll be changing permissions later anyway.
|
||||
BOOL destinationFileIsWritable;
|
||||
{
|
||||
const char *destinationFileSystemRepresentation = destinationFilePath.fileSystemRepresentation;
|
||||
struct stat destinationFileInfo;
|
||||
destinationFileIsWritable =
|
||||
(lstat(destinationFileSystemRepresentation, &destinationFileInfo) == 0 &&
|
||||
!S_ISLNK(destinationFileInfo.st_mode) &&
|
||||
access(destinationFileSystemRepresentation, W_OK) == 0);
|
||||
|
||||
}
|
||||
BOOL needsToCopyFilePermissions;
|
||||
if (![fileManager isWritableFileAtPath:destinationFilePath]) {
|
||||
if (!destinationFileIsWritable) {
|
||||
// Remove the file non-writable we're patching that may cause issues
|
||||
[fileManager removeItemAtPath:destinationFilePath error:NULL];
|
||||
|
||||
@@ -440,10 +456,16 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
fprintf(stderr, "\nApplying file system compression...");
|
||||
}
|
||||
|
||||
NSTask *dittoTask = [[NSTask alloc] init];
|
||||
NSMutableArray<NSString *> *dittoArguments = [@[@"--hfsCompression"] mutableCopy];
|
||||
if (@available(macOS 27, *)) {
|
||||
// Compression won't be applied on macOS 27 without passing --noclone
|
||||
[dittoArguments addObject:@"--noclone"];
|
||||
}
|
||||
[dittoArguments addObjectsFromArray:@[destination, finalDestination]];
|
||||
|
||||
NSTask *dittoTask = [[NSTask alloc] init];
|
||||
dittoTask.executableURL = [NSURL fileURLWithPath:@"/usr/bin/ditto" isDirectory:NO];
|
||||
dittoTask.arguments = @[@"--hfsCompression", destination, finalDestination];
|
||||
dittoTask.arguments = [dittoArguments copy];
|
||||
|
||||
// If we fail to apply file system compression, we will try falling back to not doing this
|
||||
BOOL failedToApplyFileSystemCompression = NO;
|
||||
@@ -477,6 +499,31 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
|
||||
}
|
||||
}
|
||||
|
||||
// According to https://developer.apple.com/library/mac/documentation/Carbon/Conceptual/MDImporters/Concepts/Troubleshooting.html
|
||||
// we should make sure mdimporter bundles have an up to date modification time in case they were delta updated.
|
||||
// We used to invoke mdimport on the bundle but this is not a very good approach.
|
||||
// Updating the timestamp on the mdimporter bundles is what developers have to do anyway when shipping their new update outside of Sparkle.
|
||||
NSString *spotlightDirectory = [finalDestination stringByAppendingPathComponent:@"Contents/Library/Spotlight"];
|
||||
for (NSString *spotlightItem in [fileManager contentsOfDirectoryAtPath:spotlightDirectory error:NULL]) {
|
||||
if ([spotlightItem.pathExtension isEqualToString:@"mdimporter"]) {
|
||||
const char *mdimporterPath = [spotlightDirectory stringByAppendingPathComponent:spotlightItem].fileSystemRepresentation;
|
||||
|
||||
// Using O_SYMLINK so we touch the item itself rather than what it may point to
|
||||
int mdimporterFileDescriptor = open(mdimporterPath, O_RDONLY | O_SYMLINK);
|
||||
if (mdimporterFileDescriptor == -1) {
|
||||
fprintf(stderr, "\nWarning: failed to open file descriptor to touch %s: %s", mdimporterPath, strerror(errno));
|
||||
continue;
|
||||
}
|
||||
|
||||
// Using futimes() because utimes() follows symbolic links
|
||||
if (futimes(mdimporterFileDescriptor, NULL) != 0) {
|
||||
fprintf(stderr, "\nWarning: failed to touch %s: %s", mdimporterPath, strerror(errno));
|
||||
}
|
||||
|
||||
close(mdimporterFileDescriptor);
|
||||
}
|
||||
}
|
||||
|
||||
progressCallback(6/7.0);
|
||||
|
||||
if (verbose) {
|
||||
|
||||
@@ -70,12 +70,12 @@ NSString *displayHashFromRawHash(const unsigned char *hash);
|
||||
void getRawHashFromDisplayHash(unsigned char *hash, NSString *hexHash);
|
||||
extern NSString *hashOfTreeWithVersion(NSString *path, uint16_t majorVersion);
|
||||
extern NSString *hashOfTree(NSString *path);
|
||||
BOOL fileExists(NSString *path);
|
||||
extern BOOL removeTree(NSString *path);
|
||||
extern BOOL copyTree(NSFileManager *fileManager, NSString *source, NSString *dest);
|
||||
extern BOOL modifyPermissions(NSString *path, mode_t desiredPermissions);
|
||||
extern NSString *pathRelativeToDirectory(NSString *directory, NSString *path);
|
||||
NSString *temporaryFilename(NSString *base);
|
||||
NSString *temporaryDirectory(NSString *base);
|
||||
NSString *stringWithFileSystemRepresentation(const char*);
|
||||
uint16_t latestMinorVersionForMajorVersion(SUBinaryDeltaMajorVersion majorVersion);
|
||||
#endif
|
||||
@@ -143,22 +143,6 @@ NSString *temporaryFilename(NSString *base)
|
||||
return stringWithFileSystemRepresentation(buffer);
|
||||
}
|
||||
|
||||
NSString *temporaryDirectory(NSString *base)
|
||||
{
|
||||
NSString *template = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.XXXXXXXXXX", base]];
|
||||
NSMutableData *data = [NSMutableData data];
|
||||
[data appendBytes:template.fileSystemRepresentation length:strlen(template.fileSystemRepresentation) + 1];
|
||||
|
||||
char *buffer = (char *)data.mutableBytes;
|
||||
char *templateResult = mkdtemp(buffer);
|
||||
if (templateResult == NULL) {
|
||||
perror("mkdtemp");
|
||||
return nil;
|
||||
}
|
||||
|
||||
return stringWithFileSystemRepresentation(templateResult);
|
||||
}
|
||||
|
||||
static void sha1HashOfBuffer(unsigned char *hash, const char *buffer, ssize_t bufferLength)
|
||||
{
|
||||
assert(bufferLength >= 0 && bufferLength <= UINT32_MAX);
|
||||
@@ -453,14 +437,20 @@ extern NSString *hashOfTree(NSString *path)
|
||||
return hashOfTreeWithVersion(path, SUBinaryDeltaMajorVersionLatest);
|
||||
}
|
||||
|
||||
BOOL fileExists(NSString *path)
|
||||
{
|
||||
// Don't use fileExistsForPath: because it will try to follow symbolic links
|
||||
struct stat fileInfo;
|
||||
return lstat(path.fileSystemRepresentation, &fileInfo) == 0;
|
||||
}
|
||||
|
||||
BOOL removeTree(NSString *path)
|
||||
{
|
||||
NSFileManager *fileManager = [NSFileManager defaultManager];
|
||||
// Don't use fileExistsForPath: because it will try to follow symbolic links
|
||||
if (![fileManager attributesOfItemAtPath:path error:nil]) {
|
||||
if (!fileExists(path)) {
|
||||
return YES;
|
||||
}
|
||||
return [fileManager removeItemAtPath:path error:nil];
|
||||
|
||||
return [NSFileManager.defaultManager removeItemAtPath:path error:nil];
|
||||
}
|
||||
|
||||
BOOL copyTree(NSFileManager *fileManager, NSString *source, NSString *dest)
|
||||
|
||||
@@ -81,6 +81,8 @@ extern int bsdiff(int argc, const char **argv);
|
||||
int result = bsdiff(4, argv);
|
||||
if (result == 0) {
|
||||
_resultPath = temporaryFile;
|
||||
} else {
|
||||
unlink(temporaryFile.fileSystemRepresentation);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10,8 +10,6 @@
|
||||
#import "SUUnarchiverNotifier.h"
|
||||
#import "SUBinaryDeltaCommon.h"
|
||||
#import "SUBinaryDeltaApply.h"
|
||||
#import "SULog.h"
|
||||
#import "SUFileManager.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
@@ -33,45 +31,6 @@
|
||||
return YES;
|
||||
}
|
||||
|
||||
// According to https://developer.apple.com/library/mac/documentation/Carbon/Conceptual/MDImporters/Concepts/Troubleshooting.html
|
||||
// We should make sure mdimporter bundles have an up to date time in the event they were delta updated.
|
||||
// We used to invoke mdimport on the bundle but this is not a very good approach.
|
||||
// There's no need to do that for non-delta updates and for updates that contain no mdimporters.
|
||||
// Moreover, updating the timestamp on the mdimporter bundles is what developers have to do anyway when shipping their new update outside of Sparkle
|
||||
// Note: this is used from unit tests
|
||||
+ (void)updateSpotlightImportersAtBundlePath:(NSString *)targetPath
|
||||
#ifndef BUILDING_SPARKLE_TESTS
|
||||
SPU_OBJC_DIRECT
|
||||
#endif
|
||||
{
|
||||
NSURL *targetURL = [NSURL fileURLWithPath:targetPath];
|
||||
// Only recurse if it's actually a directory. Don't recurse into a
|
||||
// root-level symbolic link.
|
||||
NSDictionary *rootAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:targetPath error:nil];
|
||||
NSString *rootType = [rootAttributes objectForKey:NSFileType];
|
||||
|
||||
if ([rootType isEqualToString:NSFileTypeDirectory]) {
|
||||
// The NSDirectoryEnumerator will avoid recursing into any contained
|
||||
// symbolic links, so no further type checks are needed.
|
||||
NSDirectoryEnumerator *directoryEnumerator = [[NSFileManager defaultManager] enumeratorAtURL:targetURL includingPropertiesForKeys:nil options:(NSDirectoryEnumerationOptions)0 errorHandler:nil];
|
||||
|
||||
NSMutableArray *filesToUpdate = [[NSMutableArray alloc] init];
|
||||
for (NSURL *file in directoryEnumerator) {
|
||||
if ([file.pathExtension isEqualToString:@"mdimporter"]) {
|
||||
[filesToUpdate addObject:file];
|
||||
}
|
||||
}
|
||||
|
||||
SUFileManager *fileManager = [[SUFileManager alloc] init];
|
||||
for (NSURL *file in filesToUpdate) {
|
||||
NSError *error = nil;
|
||||
if (![fileManager updateModificationAndAccessTimeOfItemAtURL:file error:&error]) {
|
||||
SULog(SULogLevelError, @"Error: During delta unarchiving, failed to touch %@", error);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (instancetype)initWithArchivePath:(NSString *)archivePath extractionDirectory:(NSString *)extractionDirectory updateHostBundlePath:(NSString *)updateHostBundlePath
|
||||
{
|
||||
self = [super init];
|
||||
@@ -110,7 +69,6 @@ SPU_OBJC_DIRECT
|
||||
}, &applyDiffError);
|
||||
|
||||
if (success) {
|
||||
[SUBinaryDeltaUnarchiver updateSpotlightImportersAtBundlePath:targetPath];
|
||||
[notifier notifySuccess];
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -165,21 +165,9 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
|
||||
goto reportError;
|
||||
}
|
||||
|
||||
if (@available(macOS 10.15, *)) {
|
||||
if (![inputPipe.fileHandleForWriting writeData:inputData error:&error]) {
|
||||
goto reportError;
|
||||
}
|
||||
if (![inputPipe.fileHandleForWriting writeData:inputData error:&error]) {
|
||||
goto reportError;
|
||||
}
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
|
||||
else
|
||||
{
|
||||
@try {
|
||||
[inputPipe.fileHandleForWriting writeData:inputData];
|
||||
} @catch (NSException *) {
|
||||
goto reportError;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
[inputPipe.fileHandleForWriting closeFile];
|
||||
|
||||
|
||||
+24
-103
@@ -41,25 +41,12 @@ static NSArray<NSString *> * _Nullable argumentsConformingToTypeOfPath(NSString
|
||||
@".tar.lzma" : extractTXZ,
|
||||
} mutableCopy];
|
||||
|
||||
// At least the latest versions of 10.15 understand how to extract aar files
|
||||
// Versions before 10.15 do not understand extracting newly created aar files
|
||||
// Note encrypted aea files are supported in macOS 12 onwards, if we ever want to support those one day
|
||||
if (@available(macOS 10.15.7, *)) {
|
||||
NSString *appleArchiveCommand;
|
||||
if (@available(macOS 11, *)) {
|
||||
appleArchiveCommand = @"/usr/bin/aa";
|
||||
} else {
|
||||
// In 10.15 the utility was named yaa, which was later renamed to aar
|
||||
appleArchiveCommand = @"/usr/bin/yaa";
|
||||
}
|
||||
|
||||
NSArray <NSString *> *extractAppleArchive = @[appleArchiveCommand, @"extract", @"-d"];
|
||||
|
||||
[extractCommandDictionary addEntriesFromDictionary:@{
|
||||
@".aar" : extractAppleArchive,
|
||||
@".yaa" : extractAppleArchive,
|
||||
}];
|
||||
}
|
||||
NSArray <NSString *> *extractAppleArchive = @[@"/usr/bin/aa", @"extract", @"-d"];
|
||||
|
||||
[extractCommandDictionary addEntriesFromDictionary:@{
|
||||
@".aar" : extractAppleArchive,
|
||||
@".yaa" : extractAppleArchive,
|
||||
}];
|
||||
|
||||
NSString *lastPathComponent = [path lastPathComponent];
|
||||
for (NSString *currentType in extractCommandDictionary)
|
||||
@@ -234,38 +221,12 @@ static NSArray<NSString *> * _Nullable argumentsConformingToTypeOfPath(NSString
|
||||
|
||||
NSFileHandle *archiveOutput = [pipe fileHandleForWriting];
|
||||
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
|
||||
BOOL hasIOErrorMethods;
|
||||
if (@available(macOS 10.15, *)) {
|
||||
hasIOErrorMethods = YES;
|
||||
} else {
|
||||
hasIOErrorMethods = NO;
|
||||
}
|
||||
#endif
|
||||
|
||||
do {
|
||||
NSData *data;
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
|
||||
if (!hasIOErrorMethods) {
|
||||
@try {
|
||||
data = [archiveInput readDataOfLength:256*1024];
|
||||
} @catch (NSException *exception) {
|
||||
SULog(SULogLevelError, @"Failed to read data from archive with exception reason %@", exception.reason);
|
||||
data = nil;
|
||||
}
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
NSError *readError = nil;
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wpartial-availability"
|
||||
data = [archiveInput readDataUpToLength:256*1024 error:&readError];
|
||||
#pragma clang diagnostic pop
|
||||
if (data == nil) {
|
||||
SULog(SULogLevelError, @"Failed to read data from archive with error %@", readError);
|
||||
underlyingOutError = readError;
|
||||
}
|
||||
NSError *readError = nil;
|
||||
NSData *data = [archiveInput readDataUpToLength:256*1024 error:&readError];
|
||||
if (data == nil) {
|
||||
SULog(SULogLevelError, @"Failed to read data from archive with error %@", readError);
|
||||
underlyingOutError = readError;
|
||||
}
|
||||
|
||||
NSUInteger len = [data length];
|
||||
@@ -274,37 +235,13 @@ static NSArray<NSString *> * _Nullable argumentsConformingToTypeOfPath(NSString
|
||||
}
|
||||
|
||||
NSError *writeError = nil;
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
|
||||
if (!hasIOErrorMethods) {
|
||||
@try {
|
||||
[archiveOutput writeData:data];
|
||||
} @catch (NSException *exception) {
|
||||
SULog(SULogLevelError, @"Failed to write data to pipe with exception reason %@", exception.reason);
|
||||
|
||||
if ([exception.name isEqualToString:NSFileHandleOperationException]) {
|
||||
NSError *underlyingFileHandleError = exception.userInfo[@"NSFileHandleOperationExceptionUnderlyingError"];
|
||||
NSError *underlyingPOSIXError = underlyingFileHandleError.userInfo[NSUnderlyingErrorKey];
|
||||
|
||||
underlyingOutError = underlyingPOSIXError;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wpartial-availability"
|
||||
if (![archiveOutput writeData:data error:&writeError]) {
|
||||
#pragma clang diagnostic pop
|
||||
SULog(SULogLevelError, @"Failed to write data to pipe with error %@", writeError);
|
||||
|
||||
NSError *underlyingPOSIXError = writeError.userInfo[NSUnderlyingErrorKey];
|
||||
|
||||
underlyingOutError = underlyingPOSIXError;
|
||||
break;
|
||||
}
|
||||
if (![archiveOutput writeData:data error:&writeError]) {
|
||||
SULog(SULogLevelError, @"Failed to write data to pipe with error %@", writeError);
|
||||
|
||||
NSError *underlyingPOSIXError = writeError.userInfo[NSUnderlyingErrorKey];
|
||||
|
||||
underlyingOutError = underlyingPOSIXError;
|
||||
break;
|
||||
}
|
||||
|
||||
bytesWritten += len;
|
||||
@@ -313,31 +250,15 @@ static NSArray<NSString *> * _Nullable argumentsConformingToTypeOfPath(NSString
|
||||
}
|
||||
while(bytesWritten < expectedLength);
|
||||
|
||||
if (@available(macOS 10.15, *)) {
|
||||
NSError *archiveOutputCloseError = nil;
|
||||
if (![archiveOutput closeAndReturnError:&archiveOutputCloseError]) {
|
||||
SULog(SULogLevelError, @"Failed to close pipe with error %@", archiveOutputCloseError);
|
||||
}
|
||||
NSError *archiveOutputCloseError = nil;
|
||||
if (![archiveOutput closeAndReturnError:&archiveOutputCloseError]) {
|
||||
SULog(SULogLevelError, @"Failed to close pipe with error %@", archiveOutputCloseError);
|
||||
}
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
|
||||
else
|
||||
{
|
||||
[archiveOutput closeFile];
|
||||
}
|
||||
#endif
|
||||
|
||||
if (@available(macOS 10.15, *)) {
|
||||
NSError *archiveInputCloseError = nil;
|
||||
if (![archiveInput closeAndReturnError:&archiveInputCloseError]) {
|
||||
SULog(SULogLevelError, @"Failed to close archive input with error %@", archiveInputCloseError);
|
||||
}
|
||||
NSError *archiveInputCloseError = nil;
|
||||
if (![archiveInput closeAndReturnError:&archiveInputCloseError]) {
|
||||
SULog(SULogLevelError, @"Failed to close archive input with error %@", archiveInputCloseError);
|
||||
}
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
|
||||
else
|
||||
{
|
||||
[archiveInput closeFile];
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
[task waitUntilExit];
|
||||
|
||||
@@ -1,3 +1,49 @@
|
||||
# 2.10.1
|
||||
|
||||
* Fix not trimming whitespace/newline characters from <sparkle:releaseNotesLink> (#2944) (Zorg)
|
||||
* Fix update being installed prematurely if it's located in NFC unicode encoded path (#2943) (Zorg)
|
||||
* Update Danish translation (#2940) (Sebastian Livoni)
|
||||
* Add missing "Install on Quit" localizations for uk, ru, fr, es, pt-PT. (#2931) (Andrii Selivanov)
|
||||
* Add and update translations for Chinese (Hong Kong) (zh-HK) (#2926) (Tiffany Fung)
|
||||
* Drop stale sparkle:format when generate_appcast embeds HTML release notes (#2927) (Leo Camus)
|
||||
* Skip en and Base when recording Sparkle locales in generate_appcast (#2925) (Leo Camus)
|
||||
* Fix appcast child elements being ignored when the Sparkle namespace uses a custom prefix (#2923) (Leo Camus)
|
||||
|
||||
# 2.10.0
|
||||
|
||||
* Bump minimum deployment target to macOS 12.0 (#2883, #2892) (Zorg, F1248)
|
||||
* Don't copy updater progress tool app outside of its bundle (#2900) (Zorg)
|
||||
* Fix updating not working the first time if bundle ID ends with ".service" or other irregular bundle-like extensions (#2909) (Zorg, youngjunning)
|
||||
* Fix using appcast length fallback if server reports no content size (resulting in indeterminate progress) (#2922) (Zorg)
|
||||
* Fix reading release notes content length from appcast for signed feed diagnostics (#2921) (Leo Camus)
|
||||
* Update European Portuguese localization (#2912) (Andrei)
|
||||
* Fix temporary file leaks when applying binary delta file fails (#2906) (Zorg)
|
||||
* Optimize and move updating mdimporter bundles to BinaryDelta applying code (#2905) (Zorg)
|
||||
* Fix re-applying file system compression for delta updates on macOS 27 (#2904) (Zorg)
|
||||
* Remove CocoaPods support (#2899) (Zorg)
|
||||
|
||||
macOS 12.0 or later is now required (due to Xcode 27 dropping support for deploying to older OS versions). CocoaPods support is also now dropped.
|
||||
|
||||
If you're not generating appcasts automatically, remember to add `<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>` element to `<item>`s in your appcast.
|
||||
|
||||
# 2.9.6
|
||||
|
||||
* Harden safety of installer moving the download archive (#2898) (Zorg, Joshua Rogers)
|
||||
* Don't copy progress tool for root user (#2897) (Zorg, Joshua Rogers)
|
||||
* Reject package based installs when signing validation failed (#2895) (Zorg)
|
||||
|
||||
# 2.9.5
|
||||
|
||||
* Harden patching delta file against symbolic link at destination path (#2891) (Zorg, Arpit Jain)
|
||||
|
||||
# 2.9.4
|
||||
|
||||
* Fix backgrounded apps sometimes not bringing windows from user initiated actions in active focus (#2890) (Zorg, wojciech-kulik)
|
||||
|
||||
# 2.9.3
|
||||
|
||||
* Fix updating not working the first time if the app's bundle ID ends with ".app" (#2882) (Zorg)
|
||||
|
||||
# 2.9.2
|
||||
|
||||
* Show hidden window title in update window for accessibility (#2871) (Zorg)
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz", "2.6.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.1/Sparkle-2.6.0-beta.1.tar.xz", "2.6.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.2/Sparkle-2.6.0-beta.2.tar.xz", "2.6.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0/Sparkle-2.6.0.tar.xz", "2.6.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.1/Sparkle-2.6.1.tar.xz", "1.27.2": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.2/Sparkle-1.27.2.tar.xz", "2.6.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.2/Sparkle-2.6.2.tar.xz", "1.27.3": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz", "2.6.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.3/Sparkle-2.6.3.tar.xz", "2.6.4": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz", "2.7.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0-beta.1/Sparkle-2.7.0-beta.1.tar.xz", "2.7.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0/Sparkle-2.7.0.tar.xz", "2.7.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.1/Sparkle-2.7.1.tar.xz", "2.7.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.2/Sparkle-2.7.2.tar.xz", "2.7.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.3/Sparkle-2.7.3.tar.xz", "2.8.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.1/Sparkle-2.8.0-beta.1.tar.xz", "2.8.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.2/Sparkle-2.8.0-beta.2.tar.xz", "2.8.0-beta.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.3/Sparkle-2.8.0-beta.3.tar.xz", "2.8.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0/Sparkle-2.8.0.tar.xLine truncated
|
||||
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz", "2.6.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.1/Sparkle-2.6.0-beta.1.tar.xz", "2.6.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.2/Sparkle-2.6.0-beta.2.tar.xz", "2.6.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0/Sparkle-2.6.0.tar.xz", "2.6.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.1/Sparkle-2.6.1.tar.xz", "1.27.2": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.2/Sparkle-1.27.2.tar.xz", "2.6.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.2/Sparkle-2.6.2.tar.xz", "1.27.3": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz", "2.6.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.3/Sparkle-2.6.3.tar.xz", "2.6.4": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz", "2.7.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0-beta.1/Sparkle-2.7.0-beta.1.tar.xz", "2.7.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0/Sparkle-2.7.0.tar.xz", "2.7.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.1/Sparkle-2.7.1.tar.xz", "2.7.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.2/Sparkle-2.7.2.tar.xz", "2.7.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.3/Sparkle-2.7.3.tar.xz", "2.8.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.1/Sparkle-2.8.0-beta.1.tar.xz", "2.8.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.2/Sparkle-2.8.0-beta.2.tar.xz", "2.8.0-beta.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.3/Sparkle-2.8.0-beta.3.tar.xz", "2.8.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0/Sparkle-2.8.0.tar.xLine truncated
|
||||
@@ -46,7 +46,7 @@ SPARKLE_COPY_LOCALIZATIONS = 1
|
||||
OTHER_SWIFT_FLAGS_COMMON = -DSPARKLE_BUILD_LEGACY_DSA_SUPPORT -DGENERATE_APPCAST_BUILD_LEGACY_DSA_SUPPORT -DSPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
|
||||
// Minimum supported macOS version
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.13
|
||||
MACOSX_DEPLOYMENT_TARGET = 12.0
|
||||
|
||||
// Archs to use for Sparkle
|
||||
// You can change this for example to add arm64e or remove x86_64
|
||||
@@ -98,13 +98,13 @@ SPARKLE_ICON_NAME = AppIcon
|
||||
// If you change any of these version details, you must increase CURRENT_PROJECT_VERSION
|
||||
// These variables must have a space after the '=' too
|
||||
SPARKLE_VERSION_MAJOR = 2
|
||||
SPARKLE_VERSION_MINOR = 9
|
||||
SPARKLE_VERSION_PATCH = 2
|
||||
SPARKLE_VERSION_MINOR = 10
|
||||
SPARKLE_VERSION_PATCH = 1
|
||||
|
||||
// This should be in SemVer format or empty, ie. "-beta.1"
|
||||
// These variables must have a space after the '=' too
|
||||
SPARKLE_VERSION_SUFFIX =
|
||||
CURRENT_PROJECT_VERSION = 2057
|
||||
CURRENT_PROJECT_VERSION = 2065
|
||||
|
||||
MARKETING_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)$(SPARKLE_VERSION_SUFFIX)
|
||||
ALWAYS_SEARCH_USER_PATHS = NO
|
||||
|
||||
+153
@@ -0,0 +1,153 @@
|
||||
#!/usr/bin/env python3
|
||||
#
|
||||
# generate_progress_tool_localizations.py
|
||||
#
|
||||
# The Installer Progress helper is a minimal tool that minimizes loading resolve resources.
|
||||
# This script reads the localizations from Sparkle/*.lproj/Sparkle.strings
|
||||
# and generates a header with the handful of strings the tool needs.
|
||||
# It also keeps CFBundleLocalizations in InstallerProgress-Info.plist in sync
|
||||
# with the set of locales found.
|
||||
#
|
||||
# This script must be re-run by hand after changing any of the strings below in
|
||||
# Sparkle/*.lproj/Sparkle.strings, or after adding/removing a locale.
|
||||
# Output is deterministic between runs.
|
||||
|
||||
import glob
|
||||
import json
|
||||
import os
|
||||
import plistlib
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
REPO_ROOT = os.path.dirname(SCRIPT_DIR)
|
||||
SPARKLE_DIR = os.path.join(REPO_ROOT, "Sparkle")
|
||||
OUTPUT_HEADER = os.path.join(REPO_ROOT, "Sparkle", "InstallerProgress", "SPUInstallerProgressLocalizedStrings.h")
|
||||
INFO_PLIST = os.path.join(REPO_ROOT, "Sparkle", "InstallerProgress", "InstallerProgress-Info.plist")
|
||||
|
||||
# Fixed order so regenerating the header without content changes never reorders keys
|
||||
REQUIRED_KEYS = (
|
||||
"Cancel Update",
|
||||
"Installing update…",
|
||||
"Updating %@",
|
||||
)
|
||||
|
||||
# Base.lproj holds the canonical/development-language (English) strings, but "Base"
|
||||
# is not a real locale identifier for +[NSBundle preferredLocalizationsFromArray:]
|
||||
# to match against, so it's keyed as "en" in the generated table.
|
||||
LPROJ_LOCALE_OVERRIDES = {
|
||||
"Base": "en",
|
||||
}
|
||||
|
||||
|
||||
def load_strings(strings_path):
|
||||
result = subprocess.run(
|
||||
["plutil", "-convert", "json", "-o", "-", strings_path],
|
||||
capture_output=True,
|
||||
check=True,
|
||||
text=True,
|
||||
)
|
||||
return json.loads(result.stdout)
|
||||
|
||||
|
||||
def objc_string_literal(value):
|
||||
escaped = value.replace("\\", "\\\\").replace('"', '\\"')
|
||||
escaped = escaped.replace("\n", "\\n").replace("\t", "\\t")
|
||||
return '@"' + escaped + '"'
|
||||
|
||||
|
||||
def collect_localizations():
|
||||
localizations = {}
|
||||
|
||||
lproj_dirs = sorted(glob.glob(os.path.join(SPARKLE_DIR, "*.lproj")))
|
||||
for lproj_dir in lproj_dirs:
|
||||
lproj_name = os.path.basename(lproj_dir)[: -len(".lproj")]
|
||||
locale = LPROJ_LOCALE_OVERRIDES.get(lproj_name, lproj_name)
|
||||
|
||||
strings_path = os.path.join(lproj_dir, "Sparkle.strings")
|
||||
if not os.path.isfile(strings_path):
|
||||
continue
|
||||
|
||||
table = load_strings(strings_path)
|
||||
|
||||
localized_values = {}
|
||||
for key in REQUIRED_KEYS:
|
||||
value = table.get(key)
|
||||
if value is None:
|
||||
print("warning: %s.lproj/Sparkle.strings is missing key %r" % (lproj_name, key), file=sys.stderr)
|
||||
continue
|
||||
localized_values[key] = value
|
||||
|
||||
if localized_values:
|
||||
localizations[locale] = localized_values
|
||||
|
||||
return localizations
|
||||
|
||||
|
||||
def generate_header(localizations):
|
||||
lines = []
|
||||
lines.append("//")
|
||||
lines.append("// SPUInstallerProgressLocalizedStrings.h")
|
||||
lines.append("// Sparkle")
|
||||
lines.append("//")
|
||||
lines.append("// This file is auto-generated by Configurations/generate_progress_tool_localizations.py")
|
||||
lines.append("// Do not edit by hand. Re-run the script after changing the strings below in")
|
||||
lines.append("// Sparkle/*.lproj/Sparkle.strings")
|
||||
lines.append("//")
|
||||
lines.append("")
|
||||
lines.append("#import <Foundation/Foundation.h>")
|
||||
lines.append("")
|
||||
lines.append("static NSDictionary<NSString *, NSDictionary<NSString *, NSString *> *> *const SPUInstallerProgressLocalizedStringsTable = @{")
|
||||
for locale in sorted(localizations.keys()):
|
||||
lines.append(' @"%s": @{' % locale)
|
||||
for key in REQUIRED_KEYS:
|
||||
value = localizations[locale].get(key)
|
||||
if value is None:
|
||||
continue
|
||||
lines.append(" %s: %s," % (objc_string_literal(key), objc_string_literal(value)))
|
||||
lines.append(" },")
|
||||
lines.append("};")
|
||||
lines.append("")
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
def update_info_plist_localizations(locales):
|
||||
with open(INFO_PLIST, "rb") as f:
|
||||
plist = plistlib.load(f)
|
||||
|
||||
sorted_locales = sorted(locales)
|
||||
if plist.get("CFBundleLocalizations") == sorted_locales:
|
||||
print("%s is already up to date (%d locales)" % (INFO_PLIST, len(sorted_locales)))
|
||||
return
|
||||
|
||||
plist["CFBundleLocalizations"] = sorted_locales
|
||||
|
||||
# sort_keys=False preserves the existing top-level key order, so only
|
||||
# CFBundleLocalizations's contents change in the diff
|
||||
with open(INFO_PLIST, "wb") as f:
|
||||
plistlib.dump(plist, f, fmt=plistlib.FMT_XML, sort_keys=False)
|
||||
|
||||
print("Wrote %s (%d locales)" % (INFO_PLIST, len(sorted_locales)))
|
||||
|
||||
def update_header(localizations):
|
||||
header_contents = generate_header(localizations)
|
||||
|
||||
if os.path.isfile(OUTPUT_HEADER):
|
||||
with open(OUTPUT_HEADER, "r", encoding="utf-8") as f:
|
||||
if f.read() == header_contents:
|
||||
print("%s is already up to date (%d locales)" % (OUTPUT_HEADER, len(localizations)))
|
||||
return
|
||||
|
||||
with open(OUTPUT_HEADER, "w", encoding="utf-8") as f:
|
||||
f.write(header_contents)
|
||||
|
||||
print("Wrote %s (%d locales)" % (OUTPUT_HEADER, len(localizations)))
|
||||
|
||||
|
||||
def main():
|
||||
localizations = collect_localizations()
|
||||
update_header(localizations)
|
||||
update_info_plist_localizations(localizations.keys())
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -122,10 +122,9 @@ if [ "$ACTION" = "" ] ; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Generate new Package manifest, podspec, and carthage files
|
||||
# Generate new Package manifest and carthage files
|
||||
cd "$CONFIGURATION_BUILD_DIR"
|
||||
cp "$PROJECT_DIR/Package.swift" "$CONFIGURATION_BUILD_DIR"
|
||||
cp "$PROJECT_DIR/Sparkle.podspec" "$CONFIGURATION_BUILD_DIR"
|
||||
cp "$PROJECT_DIR/Carthage-dev.json" "$CONFIGURATION_BUILD_DIR"
|
||||
fi
|
||||
|
||||
@@ -141,14 +140,11 @@ if [ "$ACTION" = "" ] ; then
|
||||
echo "Version: $MARKETING_VERSION"
|
||||
echo "Tag: $latest_git_tag"
|
||||
echo "Checksum: $spm_checksum"
|
||||
|
||||
sed -E -i '' -e "/s\.version.+=/ s/\".+\"/\"$MARKETING_VERSION\"/" "Sparkle.podspec"
|
||||
|
||||
"$PROJECT_DIR/Configurations/update-carthage.py" "Carthage-dev.json" "$MARKETING_VERSION"
|
||||
cp "Sparkle.podspec" "$PROJECT_DIR"
|
||||
# Note the Carthage-dev.json file will finally be copied to the website repo in Carthage/Sparkle.json in the end
|
||||
cp "Carthage-dev.json" "$PROJECT_DIR"
|
||||
echo "Sparkle.podspec and Carthage-dev.json updated with following values:"
|
||||
echo "Carthage-dev.json is updated with following values:"
|
||||
echo "Version: $MARKETING_VERSION"
|
||||
else
|
||||
echo "warning: Xcode version $XCODE_VERSION_ACTUAL does not support computing checksums for Swift Packages. Please update the Package manifest manually."
|
||||
|
||||
@@ -13,10 +13,10 @@ function move_tag() {
|
||||
long_message=$(git tag -n99 -l $latest_git_tag) # gets corresponding message
|
||||
long_message=${long_message/$latest_git_tag} # trims tag name
|
||||
long_message="$(echo -e "${long_message}" | sed -e 's/^[[:space:]]*//')" # trim leading whitespace
|
||||
git add Package.swift Sparkle.podspec Carthage-dev.json
|
||||
git add Package.swift Carthage-dev.json
|
||||
git commit -m "Update Package management files for version ${latest_git_tag}"
|
||||
git tag -fa $latest_git_tag -m "${long_message}"
|
||||
echo "Package.swift and Sparkle.podspec committed and tag '$latest_git_tag' moved."
|
||||
echo "Package.swift is committed and tag '$latest_git_tag' moved."
|
||||
}
|
||||
|
||||
if [ "$commits_since_tag" -gt 0 ]; then
|
||||
@@ -27,11 +27,11 @@ elif [ "$CI" == true ]; then
|
||||
move_tag
|
||||
else
|
||||
# TODO: add sanity check to see if version is actually being updated or not?
|
||||
read -p "Do you want to commit changes to Package.swift, Sparkle.podspec, Carthage-dev.json and force move tag '$latest_git_tag'? (required for official release) [Y/n]" -n 1 -r
|
||||
read -p "Do you want to commit changes to Package.swift, Carthage-dev.json, and force move tag '$latest_git_tag'? (required for official release) [Y/n]" -n 1 -r
|
||||
echo # (optional) move to a new line
|
||||
if [[ $REPLY =~ ^[Yy]$ ]]; then
|
||||
move_tag
|
||||
else
|
||||
echo "Package.swift, Sparkle.podspec, and Carthage-dev.json have not been committed and tag has not been moved."
|
||||
echo "Package.swift and Carthage-dev.json have not been committed and tag has not been moved."
|
||||
fi
|
||||
fi
|
||||
@@ -312,9 +312,9 @@ static bool SPUValidateStatusCodeAndFailIfInvalid(NSURLResponse * _Nullable resp
|
||||
return;
|
||||
}
|
||||
|
||||
if (totalBytesExpectedToWrite > 0 && !_receivedExpectedBytes) {
|
||||
if (!_receivedExpectedBytes) {
|
||||
_receivedExpectedBytes = YES;
|
||||
[_delegate downloaderDidReceiveExpectedContentLength:totalBytesExpectedToWrite];
|
||||
[_delegate downloaderDidReceiveExpectedContentLength:(totalBytesExpectedToWrite != NSURLSessionTransferSizeUnknown) ? totalBytesExpectedToWrite : 0];
|
||||
}
|
||||
|
||||
if (bytesWritten >= 0) {
|
||||
|
||||
@@ -192,15 +192,7 @@
|
||||
NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:iconBundlePath];
|
||||
|
||||
// Creating a bitmap representation at a specific size is much cheaper than asking for icon's TIFFRepresentation
|
||||
// On older OS's we must create a 32x32 image otherwise it won't be scaled correctly in the dialog
|
||||
// On newer OS's we can use a slightly higher resolution image
|
||||
NSInteger imageDimensions;
|
||||
if (@available(macOS 10.15, *)) {
|
||||
imageDimensions = 64;
|
||||
} else {
|
||||
imageDimensions = 32;
|
||||
}
|
||||
|
||||
const NSInteger imageDimensions = 64;
|
||||
NSBitmapImageRep *iconBitmapRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:imageDimensions pixelsHigh:imageDimensions bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace bytesPerRow:0 bitsPerPixel:0];
|
||||
|
||||
[NSGraphicsContext saveGraphicsState];
|
||||
@@ -506,8 +498,6 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
|
||||
|
||||
NSString *userName;
|
||||
NSString *homeDirectory;
|
||||
uid_t uid = 0;
|
||||
gid_t gid = 0;
|
||||
if (!rootUser) {
|
||||
// Normal path
|
||||
homeDirectory = NSHomeDirectory();
|
||||
@@ -518,7 +508,7 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
|
||||
} else {
|
||||
// As the root user we need to obtain the user name and home directory reflecting
|
||||
// the user's console session.
|
||||
CFStringRef userNameRef = SCDynamicStoreCopyConsoleUser(NULL, &uid, &gid);
|
||||
CFStringRef userNameRef = SCDynamicStoreCopyConsoleUser(NULL, NULL, NULL);
|
||||
if (userNameRef == NULL) {
|
||||
SULog(SULogLevelError, @"Failed to retrieve user name from the console user");
|
||||
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
|
||||
@@ -535,59 +525,11 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
|
||||
}
|
||||
}
|
||||
|
||||
// It may be tempting here to validate/match the signature of the installer and progress tool, however this is not very reliable
|
||||
// We can't compare the signature of this framework/XPC service (depending how it's run) to the host bundle because
|
||||
// they could be different (eg: take a look at sparkle-cli). We also can't easily tell if the signature of the service/framework is the same as the bundle it's inside.
|
||||
// The service/framework also need not even be signed in the first place. We'll just assume for now the original bundle hasn't been tampered with
|
||||
NSString *cachePath = rootUser ?
|
||||
[SPULocalCacheDirectory cachePathForBundleIdentifier:hostBundleIdentifier userName:userName] :
|
||||
[SPULocalCacheDirectory cachePathForBundleIdentifier:hostBundleIdentifier];
|
||||
|
||||
NSString *rootLauncherCachePath = [cachePath stringByAppendingPathComponent:@"Launcher"];
|
||||
|
||||
[SPULocalCacheDirectory removeOldItemsInDirectory:rootLauncherCachePath];
|
||||
|
||||
NSDictionary<NSFileAttributeKey, id> *fileAttributes = rootUser ?
|
||||
@{NSFileOwnerAccountID: @(uid), NSFileGroupOwnerAccountID: @(gid)} :
|
||||
nil;
|
||||
|
||||
NSString *launcherCachePath = [SPULocalCacheDirectory createUniqueDirectoryInDirectory:rootLauncherCachePath intermediateDirectoryFileAttributes:fileAttributes];
|
||||
|
||||
if (launcherCachePath == nil) {
|
||||
SULog(SULogLevelError, @"Failed to create cache directory for progress tool in %@", rootLauncherCachePath);
|
||||
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
|
||||
return;
|
||||
}
|
||||
|
||||
SUFileManager *fileManager = [[SUFileManager alloc] init];
|
||||
|
||||
if (rootUser) {
|
||||
// Ensure the console user has ownership of the launcher cache directory
|
||||
// Otherwise the updater may not launch and not be able to clean up itself
|
||||
NSError *changeOwnerAndGroupError = nil;
|
||||
if (![fileManager changeOwnerAndGroupOfItemAtURL:[NSURL fileURLWithPath:launcherCachePath] ownerID:uid groupID:gid error:&changeOwnerAndGroupError]) {
|
||||
SULog(SULogLevelError, @"Failed to change owner and group for launcher cache directory: %@", changeOwnerAndGroupError);
|
||||
|
||||
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
NSString *progressToolPath = [launcherCachePath stringByAppendingPathComponent:@""SPARKLE_INSTALLER_PROGRESS_TOOL_NAME@".app"];
|
||||
|
||||
NSError *copyError = nil;
|
||||
// SUFileManager is more reliable for copying files around
|
||||
if (![fileManager copyItemAtURL:[NSURL fileURLWithPath:progressToolResourcePath] toURL:[NSURL fileURLWithPath:progressToolPath] error:©Error]) {
|
||||
SULog(SULogLevelError, @"Failed to copy progress tool to cache: %@", copyError);
|
||||
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
|
||||
return;
|
||||
}
|
||||
|
||||
SUInstallerLauncherStatus installerStatus = [self submitInstallerAtPath:installerPath withHostBundle:hostBundle iconBundlePath:mainBundle.bundlePath updaterIdentifier:updaterIdentifier userName:userName homeDirectory:homeDirectory mainBundleName:mainBundleName inSystemDomain:inSystemDomain rootUser:rootUser];
|
||||
|
||||
BOOL submittedProgressTool = NO;
|
||||
if (installerStatus == SUInstallerLauncherSuccess) {
|
||||
submittedProgressTool = [self submitProgressToolAtPath:progressToolPath withHostBundle:hostBundle inSystemDomainForInstaller:inSystemDomain];
|
||||
submittedProgressTool = [self submitProgressToolAtPath:progressToolResourcePath withHostBundle:hostBundle inSystemDomainForInstaller:inSystemDomain];
|
||||
|
||||
if (!submittedProgressTool) {
|
||||
SULog(SULogLevelError, @"Failed to submit progress tool job");
|
||||
|
||||
@@ -16,8 +16,6 @@ release:
|
||||
xcodebuild -scheme Distribution -configuration Release -derivedDataPath "$(BUILDDIR)" build
|
||||
./Configurations/release-move-tag.sh
|
||||
open "$(BUILDDIR)/Build/Products/Release/"
|
||||
cat Sparkle.podspec
|
||||
@echo "Don't forget to update CocoaPods! pod trunk push"
|
||||
@echo "Don't forget to upload Sparkle-for-Swift-Package-Manager.zip!"
|
||||
|
||||
build:
|
||||
|
||||
+5
-5
@@ -1,16 +1,16 @@
|
||||
// swift-tools-version:5.3
|
||||
// swift-tools-version:5.5
|
||||
import PackageDescription
|
||||
|
||||
// Version is technically not required here, SPM doesn't check
|
||||
let version = "2.9.2"
|
||||
let version = "2.10.1"
|
||||
// Tag is required to point towards the right asset. SPM requires the tag to follow semantic versioning to be able to resolve it.
|
||||
let tag = "2.9.2"
|
||||
let checksum = "b83e37436774556ed055e0244b297ef2c790e0737393bf65bf495fcbba6eed65"
|
||||
let tag = "2.10.1"
|
||||
let checksum = "4c2e48a3e50ebcc2c88a58a4c7264a1a99c3c31857ce754357afb9cdb323022a"
|
||||
let url = "https://github.com/sparkle-project/Sparkle/releases/download/\(tag)/Sparkle-for-Swift-Package-Manager.zip"
|
||||
|
||||
let package = Package(
|
||||
name: "Sparkle",
|
||||
platforms: [.macOS(.v10_13)], // leaving "10.13" as a breadcrumb for searching
|
||||
platforms: [.macOS(.v12)], // leaving "12.0" as a breadcrumb for searching; aligned with swift-tools-version at top of file (see https://developer.apple.com/documentation/packagedescription/supportedplatform/macosversion)
|
||||
products: [
|
||||
.library(
|
||||
name: "Sparkle",
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
# Sparkle 2 [](https://github.com/sparkle-project/Sparkle/actions/workflows/ci.yml)  [](https://github.com/Carthage/Carthage) [](https://cocoapods.org/pods/Sparkle)
|
||||
# Sparkle 2 [](https://github.com/sparkle-project/Sparkle/actions/workflows/ci.yml)  [](https://github.com/Carthage/Carthage)
|
||||
|
||||
Secure and reliable software update framework for macOS.
|
||||
|
||||
@@ -29,7 +29,7 @@ Please visit [Sparkle's website](http://sparkle-project.org) for up to date docu
|
||||
|
||||
## Requirements
|
||||
|
||||
* Runtime: macOS 10.13 or later.
|
||||
* Runtime: macOS 12.0 or later on `2.x`, macOS 10.13 or later on `2.9.6`.
|
||||
* Build: Latest major Xcode (stable or beta, whichever is latest) and one major version less.
|
||||
* HTTPS server for serving updates (see [App Transport Security](http://sparkle-project.org/documentation/app-transport-security/))
|
||||
|
||||
|
||||
@@ -8,47 +8,35 @@
|
||||
<title>Version 2.0 (2 bugs fixed; 3 new features)</title>
|
||||
<link>https://sparkle-project.org</link>
|
||||
<sparkle:version>2.0</sparkle:version>
|
||||
<sparkle:releaseNotesLink>
|
||||
https://you.com/app/2.0.html
|
||||
</sparkle:releaseNotesLink>
|
||||
<sparkle:fullReleaseNotesLink>
|
||||
https://you.com/app/changelog.php
|
||||
</sparkle:fullReleaseNotesLink>
|
||||
<sparkle:releaseNotesLink>https://you.com/app/2.0.html</sparkle:releaseNotesLink>
|
||||
<sparkle:fullReleaseNotesLink>https://you.com/app/changelog.php</sparkle:fullReleaseNotesLink>
|
||||
<pubDate>Wed, 09 Jan 2006 19:20:11 +0000</pubDate>
|
||||
<enclosure url="https://you.com/app/Your%20Great%20App%202.0.zip" length="1623481" type="application/octet-stream" sparkle:edSignature="WVyVJpOx+a5+vNWJVY79TRjFKveNk+VhGJf2iti4CZtJsJewIUGvh/1AKKEAFbH1qUwx+vro1ECuzOsMmumoBA==" />
|
||||
<sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>
|
||||
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<title>Version 1.5 (8 bugs fixed; 2 new features)</title>
|
||||
<link>https://sparkle-project.org</link>
|
||||
<sparkle:version>1.5</sparkle:version>
|
||||
<sparkle:releaseNotesLink>
|
||||
https://you.com/app/1.5.html
|
||||
</sparkle:releaseNotesLink>
|
||||
<sparkle:fullReleaseNotesLink>
|
||||
https://you.com/app/changelog.php?up-to=1.5
|
||||
</sparkle:fullReleaseNotesLink>
|
||||
<sparkle:releaseNotesLink>https://you.com/app/1.5.html</sparkle:releaseNotesLink>
|
||||
<sparkle:fullReleaseNotesLink>https://you.com/app/changelog.php?up-to=1.5</sparkle:fullReleaseNotesLink>
|
||||
<pubDate>Wed, 01 Jan 2006 12:20:11 +0000</pubDate>
|
||||
<enclosure url="https://you.com/app/Your%20Great%20App%201.5.zip" length="1472893" type="application/octet-stream" sparkle:edSignature="pNFd7KbcQSu+Mq7UYrbQXTPq82luht2ACXm/r2utp1u/Uv/5hWqctdT2jwQgMejW7DRoeV/hVr6J4VdZYdwWDw==" />
|
||||
<sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>
|
||||
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
|
||||
</item>
|
||||
|
||||
<!-- Now here's an example of a version with a weird internal version number (like an SVN revision) but a human-readable external one. -->
|
||||
<item>
|
||||
<title>Version 1.4 (5 bugs fixed; 2 new features)</title>
|
||||
<link>https://sparkle-project.org</link>
|
||||
<sparkle:releaseNotesLink>
|
||||
https://you.com/app/1.4.html
|
||||
</sparkle:releaseNotesLink>
|
||||
<sparkle:fullReleaseNotesLink>
|
||||
https://you.com/app/changelog.php?up-to=1.4
|
||||
</sparkle:fullReleaseNotesLink>
|
||||
<sparkle:releaseNotesLink>https://you.com/app/1.4.html</sparkle:releaseNotesLink>
|
||||
<sparkle:fullReleaseNotesLink>https://you.com/app/changelog.php?up-to=1.4</sparkle:fullReleaseNotesLink>
|
||||
<sparkle:version>241</sparkle:version>
|
||||
<sparkle:shortVersionString>1.4</sparkle:shortVersionString>
|
||||
<pubDate>Wed, 25 Dec 2005 12:20:11 +0000</pubDate>
|
||||
<enclosure url="https://you.com/app/Your%20Great%20App%201.4.zip" sparkle:edSignature="Ody3D/ybSMH4T+P/oNj3LN4F0SA8RJGLEr1TI4UemrBAiJ9aEcDnYV3u58P75AbcFjI13jPYmHDUHXMSTFQbDw==" length="1472349" type="application/octet-stream" />
|
||||
<sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>
|
||||
<sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
|
||||
</item>
|
||||
</channel>
|
||||
</rss>
|
||||
@@ -1,33 +0,0 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "Sparkle"
|
||||
s.version = "2.9.2"
|
||||
s.summary = "A software update framework for macOS"
|
||||
s.description = "Sparkle is an easy-to-use software update framework for macOS."
|
||||
s.homepage = "https://sparkle-project.org"
|
||||
s.documentation_url = "https://sparkle-project.org/documentation/"
|
||||
s.screenshot = "https://sparkle-project.org/images/screenshot-noshadow2.png"
|
||||
s.license = {
|
||||
:type => 'MIT',
|
||||
:file => 'LICENSE'
|
||||
}
|
||||
s.authors = {
|
||||
'Zorg' => 'zorgiepoo@gmail.com',
|
||||
'Kornel Lesiński' => 'pornel@pornel.net',
|
||||
'Jake Petroules' => 'jake.petroules@petroules.com',
|
||||
'C.W. Betts' => 'computers57@hotmail.com',
|
||||
'Andy Matuschak' => 'andy@andymatuschak.org',
|
||||
}
|
||||
|
||||
s.platform = :osx, '10.13'
|
||||
s.source = { :http => "https://github.com/sparkle-project/Sparkle/releases/download/#{s.version}/Sparkle-#{s.version}.tar.xz" }
|
||||
s.source_files = 'Sparkle.framework/Versions/B/Headers/*.h'
|
||||
|
||||
s.preserve_paths = ['bin/*', 'Symbols']
|
||||
s.public_header_files = 'Sparkle.framework/Versions/B/Headers/*.h'
|
||||
s.vendored_frameworks = 'Sparkle.framework'
|
||||
s.xcconfig = {
|
||||
'FRAMEWORK_SEARCH_PATHS' => '"${PODS_ROOT}/Sparkle"',
|
||||
'LD_RUNPATH_SEARCH_PATHS' => '@loader_path/../Frameworks'
|
||||
}
|
||||
s.requires_arc = true
|
||||
end
|
||||
@@ -53,7 +53,6 @@
|
||||
14958C6F19AEBC980061B14F /* test-pubkey.pem in Resources */ = {isa = PBXBuildFile; fileRef = 14958C6C19AEBC610061B14F /* test-pubkey.pem */; };
|
||||
1EAA4C8B2132C7BF00604473 /* ReleaseNotesColorStyle.css in Resources */ = {isa = PBXBuildFile; fileRef = 1EAA4C8A2132C7BF00604473 /* ReleaseNotesColorStyle.css */; };
|
||||
3772FEA913DE0B6B00F79537 /* SUVersionDisplayProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 3772FEA813DE0B6B00F79537 /* SUVersionDisplayProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
55C14BEF136EF21700649790 /* SUStatus.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BD8136EF00C00649790 /* SUStatus.xib */; };
|
||||
55C14F06136EF6DB00649790 /* SULog.h in Headers */ = {isa = PBXBuildFile; fileRef = 55C14F04136EF6DB00649790 /* SULog.h */; };
|
||||
55C14F07136EF6DB00649790 /* SULog.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C14F05136EF6DB00649790 /* SULog.m */; };
|
||||
55E6F33319EC9F6C00005E76 /* SUErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 55E6F33219EC9F6C00005E76 /* SUErrors.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
@@ -197,6 +196,7 @@
|
||||
723C8A551E2D60DB00C14942 /* SUTouchBarButtonGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 723C8A531E2D60DB00C14942 /* SUTouchBarButtonGroup.m */; };
|
||||
723C8A561E2D60DB00C14942 /* SUTouchBarButtonGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 723C8A531E2D60DB00C14942 /* SUTouchBarButtonGroup.m */; };
|
||||
723EDC3F26885A8E000BCBA4 /* testappcast_channels.xml in Resources */ = {isa = PBXBuildFile; fileRef = 723EDC3E26885A8E000BCBA4 /* testappcast_channels.xml */; };
|
||||
723F25FE2E75F76400462999 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 723F25FD2E75F76400462999 /* AppIcon.icon */; };
|
||||
7240852E2CA11C1400ED2FCD /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7240852D2CA11C1400ED2FCD /* libz.tbd */; };
|
||||
7245495C2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h in Headers */ = {isa = PBXBuildFile; fileRef = 7245495B2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h */; };
|
||||
72464F701E1F31E000FB341C /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
|
||||
@@ -229,6 +229,7 @@
|
||||
725CB9571C7120410064365A /* SPUUserDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 725CB9561C7120410064365A /* SPUUserDriver.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
725CB95A1C7121830064365A /* SPUStandardUserDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 725CB9581C7121830064365A /* SPUStandardUserDriver.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
725CB95B1C7121830064365A /* SPUStandardUserDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 725CB9591C7121830064365A /* SPUStandardUserDriver.m */; };
|
||||
725EA4B23027D2AF0041BFA6 /* test-package-update.xml in Resources */ = {isa = PBXBuildFile; fileRef = 725EA4B13027D2AF0041BFA6 /* test-package-update.xml */; };
|
||||
725EE480277BF13B00D820CE /* SPUXarDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */; };
|
||||
725EE482277BF44A00D820CE /* SPUXarDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */; };
|
||||
725EE483277C767A00D820CE /* SPUXarDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */; };
|
||||
@@ -392,7 +393,6 @@
|
||||
72B767E61C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767E41C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h */; };
|
||||
72B767E71C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767E51C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m */; };
|
||||
72BC6C3D275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72BC6C3C275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg */; };
|
||||
72BEBFEF1D7287570019146B /* SUSpotlightImporterTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */; };
|
||||
72C56E042EFB45B10005A484 /* SUSignatureVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E59B1D3D8A5A00D1BF90 /* SUSignatureVerifier.m */; };
|
||||
72C56E052EFB45BD0005A484 /* SPUVerifierInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */; };
|
||||
72C56E062EFB45C80005A484 /* libed25519.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E282D22B660BE004AA304 /* libed25519.a */; };
|
||||
@@ -409,6 +409,8 @@
|
||||
72C56E1F2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E1E2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift */; };
|
||||
72C56E202F04B3760005A484 /* Signing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E0F2EFEF10B0005A484 /* Signing.swift */; };
|
||||
72C56E262F04C28B0005A484 /* testreleasenotes.html in Resources */ = {isa = PBXBuildFile; fileRef = 72C56E212F04C28B0005A484 /* testreleasenotes.html */; };
|
||||
72C6F2DB303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72C6F2D8303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg */; };
|
||||
72C6F2DD303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72C6F2DC303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg */; };
|
||||
72CCDEBE27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip in Resources */ = {isa = PBXBuildFile; fileRef = 72CCDEBD27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip */; };
|
||||
72D04F3D2B094C8400A6DEAA /* SPUVerifierInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */; };
|
||||
72D04F3E2B097D4300A6DEAA /* SPUVerifierInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */; };
|
||||
@@ -432,7 +434,6 @@
|
||||
72EB736129BEB36100FBCEE7 /* DevSignedAppVersion2.zip in Resources */ = {isa = PBXBuildFile; fileRef = 72EB736029BEB36100FBCEE7 /* DevSignedAppVersion2.zip */; };
|
||||
72EB87EA1CB8798800C37F42 /* ShowInstallerProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EB87E91CB8798800C37F42 /* ShowInstallerProgress.m */; };
|
||||
72EB87EB1CB8859100C37F42 /* Updater.app in Copy Tools */ = {isa = PBXBuildFile; fileRef = 721C24451CB753E6005440CB /* Updater.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
|
||||
72EB87EC1CB8887E00C37F42 /* SUStatus.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BD8136EF00C00649790 /* SUStatus.xib */; };
|
||||
72EE17FB26D1CC8800C58B19 /* SUInstallerLauncher+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72EE17FA26D1CBC000C58B19 /* SUInstallerLauncher+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||
72EE17FC26D1CC9D00C58B19 /* SPUInstallationType.h in Headers */ = {isa = PBXBuildFile; fileRef = 7214B8851D45AD9A00CB5CED /* SPUInstallationType.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||
72EE181926DAE70900C58B19 /* SPUUpdateCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 72EE181826DAE6E100C58B19 /* SPUUpdateCheck.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
@@ -930,7 +931,6 @@
|
||||
142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBinaryDeltaTest.m; sourceTree = "<group>"; };
|
||||
14652F7919A93E5F00959E44 /* set-git-version-info.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "set-git-version-info.sh"; sourceTree = "<group>"; };
|
||||
14652F8319A9759F00959E44 /* SUExport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUExport.h; sourceTree = "<group>"; };
|
||||
146EC84E19A68CF8004A50C5 /* Sparkle.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = Sparkle.podspec; sourceTree = SOURCE_ROOT; };
|
||||
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 = "<group>"; };
|
||||
14732BBA1960EF7100593899 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = SOURCE_ROOT; };
|
||||
@@ -956,7 +956,6 @@
|
||||
4607BEA21948443800EF8DA4 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
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 = "<group>"; };
|
||||
55C14BD8136EF00C00649790 /* SUStatus.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SUStatus.xib; sourceTree = "<group>"; };
|
||||
55C14F04136EF6DB00649790 /* SULog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SULog.h; sourceTree = "<group>"; };
|
||||
55C14F05136EF6DB00649790 /* SULog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SULog.m; sourceTree = "<group>"; };
|
||||
55C14F31136EFC2400649790 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
|
||||
@@ -1147,6 +1146,7 @@
|
||||
723C8A531E2D60DB00C14942 /* SUTouchBarButtonGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUTouchBarButtonGroup.m; sourceTree = "<group>"; };
|
||||
723DFF962B3DFF6E00628E6C /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
|
||||
723EDC3E26885A8E000BCBA4 /* testappcast_channels.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testappcast_channels.xml; sourceTree = "<group>"; };
|
||||
723F25FD2E75F76400462999 /* AppIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIcon.icon; sourceTree = "<group>"; };
|
||||
7240852D2CA11C1400ED2FCD /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
|
||||
7245495B2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SPUUpdaterSettings+Debug.h"; sourceTree = "<group>"; };
|
||||
7246E0A11C83B685003B4E75 /* SPUStandardUpdaterController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUStandardUpdaterController.h; sourceTree = "<group>"; };
|
||||
@@ -1187,6 +1187,7 @@
|
||||
725CB9581C7121830064365A /* SPUStandardUserDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUStandardUserDriver.h; sourceTree = "<group>"; };
|
||||
725CB9591C7121830064365A /* SPUStandardUserDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUStandardUserDriver.m; sourceTree = "<group>"; };
|
||||
725DED72263D10C400E7FA8F /* SUAppcast+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SUAppcast+Private.h"; sourceTree = "<group>"; };
|
||||
725EA4B13027D2AF0041BFA6 /* test-package-update.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "test-package-update.xml"; sourceTree = "<group>"; };
|
||||
725EE47E277BF13A00D820CE /* SPUXarDeltaArchive.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPUXarDeltaArchive.h; path = Autoupdate/SPUXarDeltaArchive.h; sourceTree = SOURCE_ROOT; };
|
||||
725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SPUXarDeltaArchive.m; path = Autoupdate/SPUXarDeltaArchive.m; sourceTree = SOURCE_ROOT; };
|
||||
725EE481277BF17A00D820CE /* SPUDeltaArchiveProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPUDeltaArchiveProtocol.h; path = Autoupdate/SPUDeltaArchiveProtocol.h; sourceTree = SOURCE_ROOT; };
|
||||
@@ -1340,13 +1341,16 @@
|
||||
72B767E41C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUAutomaticUpdateDriver.h; sourceTree = "<group>"; };
|
||||
72B767E51C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUAutomaticUpdateDriver.m; sourceTree = "<group>"; };
|
||||
72BC6C3C275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSign_apfs.dmg; sourceTree = "<group>"; };
|
||||
72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SUSpotlightImporterTest.swift; sourceTree = "<group>"; };
|
||||
72C4E01F30340BE400DAF61C /* SPUInstallerProgressLocalizedStrings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUInstallerProgressLocalizedStrings.h; sourceTree = "<group>"; };
|
||||
72C4E02030340C2B00DAF61C /* generate_progress_tool_localizations.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = generate_progress_tool_localizations.py; sourceTree = "<group>"; };
|
||||
72C56E072EFDFB850005A484 /* SPUExtractSignedFeed.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUExtractSignedFeed.h; sourceTree = "<group>"; };
|
||||
72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUExtractSignedFeed.m; sourceTree = "<group>"; };
|
||||
72C56E0F2EFEF10B0005A484 /* Signing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Signing.swift; sourceTree = "<group>"; };
|
||||
72C56E182F04343D0005A484 /* SPUAppcastSigningValidationStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUAppcastSigningValidationStatus.h; sourceTree = "<group>"; };
|
||||
72C56E1E2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SUFeedSignatureVerifierTest.swift; sourceTree = "<group>"; };
|
||||
72C56E212F04C28B0005A484 /* testreleasenotes.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = testreleasenotes.html; sourceTree = "<group>"; };
|
||||
72C6F2D8303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SparkleTestCodeSignApp.license.no-text.dmg"; sourceTree = "<group>"; };
|
||||
72C6F2DC303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg"; sourceTree = "<group>"; };
|
||||
72CCDEBD27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SparkleTestCodeSignApp_bad_header.zip; sourceTree = "<group>"; };
|
||||
72D04F3B2B094C8400A6DEAA /* SPUVerifierInformation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUVerifierInformation.h; sourceTree = "<group>"; };
|
||||
72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUVerifierInformation.m; sourceTree = "<group>"; };
|
||||
@@ -1724,7 +1728,6 @@
|
||||
children = (
|
||||
8DC2EF5A0486A6940098B216 /* Sparkle-Info.plist */,
|
||||
61AAE8220A321A7F00D8810D /* Sparkle.strings */,
|
||||
55C14BD8136EF00C00649790 /* SUStatus.xib */,
|
||||
729C51272E58015600D7365A /* SUUpdatePermissionPrompt.xib */,
|
||||
72FE54412E56A14100227A91 /* SUUpdateAlert.xib */,
|
||||
);
|
||||
@@ -1826,6 +1829,8 @@
|
||||
F8761EB21ADC50EB000C9034 /* SparkleTestCodeSignApp.zip */,
|
||||
726FC0352C1E787A00177986 /* SparkleTestCodeSignApp.aar */,
|
||||
726FC0372C1E96AA00177986 /* SparkleTestCodeSignApp.enc.aar */,
|
||||
72C6F2D8303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg */,
|
||||
72C6F2DC303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg */,
|
||||
72EB735E29BE981300FBCEE7 /* DevSignedApp.zip */,
|
||||
72EB736029BEB36100FBCEE7 /* DevSignedAppVersion2.zip */,
|
||||
726B20602CF4F1D300E6F7DB /* DevSignedAppVersion2.dmg */,
|
||||
@@ -1845,6 +1850,7 @@
|
||||
5A5DD41B249F0F4B0045EB3E /* test-relative-urls.xml */,
|
||||
729F7EAB27366353004592DC /* test-links.xml */,
|
||||
723AD12E29922B5F006BB02F /* test-dangerous-link.xml */,
|
||||
725EA4B13027D2AF0041BFA6 /* test-package-update.xml */,
|
||||
72C56E212F04C28B0005A484 /* testreleasenotes.html */,
|
||||
5A5DD40324958AFF0045EB3E /* SUUpdateValidatorTest */,
|
||||
);
|
||||
@@ -1928,7 +1934,6 @@
|
||||
72C56E1E2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift */,
|
||||
72A4A23F1BB6567D00E7820D /* SUFileManagerTest.swift */,
|
||||
5AF6C74C1AEA40760014A3AB /* SUInstallerTest.m */,
|
||||
72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */,
|
||||
7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */,
|
||||
5A5DD400249585E70045EB3E /* SUUpdateValidatorTest.swift */,
|
||||
14950074195FDF5900BC5B5B /* SUUpdaterTest.m */,
|
||||
@@ -2062,6 +2067,7 @@
|
||||
72E45CF51B640DAE005C701A /* SUUpdateSettingsWindowController.m */,
|
||||
72E45CF61B640DAE005C701A /* SUUpdateSettingsWindowController.xib */,
|
||||
61B5F90409C4CEE200B25A18 /* TestApplication-Info.plist */,
|
||||
723F25FD2E75F76400462999 /* AppIcon.icon */,
|
||||
72F0EC44278A55CA002A876A /* screenshot.png */,
|
||||
);
|
||||
name = "Test Application";
|
||||
@@ -2156,6 +2162,7 @@
|
||||
72D954801CBACC35006F28BD /* InstallerProgressAppController.m */,
|
||||
72D954851CBAD4AE006F28BD /* InstallerProgressDelegate.h */,
|
||||
72D954821CBAD34F006F28BD /* main.m */,
|
||||
72C4E01F30340BE400DAF61C /* SPUInstallerProgressLocalizedStrings.h */,
|
||||
72D954841CBAD418006F28BD /* ShowInstallerProgress.h */,
|
||||
72EB87E91CB8798800C37F42 /* ShowInstallerProgress.m */,
|
||||
722194511D3BF987004C34FF /* SPUInstallerAgentProtocol.h */,
|
||||
@@ -2487,7 +2494,7 @@
|
||||
72045CE426FEE708004F96E5 /* strip-framework.sh */,
|
||||
720C192827127A3800740C8E /* release-move-tag.sh */,
|
||||
720B4C2325EBFAFD005A0592 /* link-tools.sh */,
|
||||
146EC84E19A68CF8004A50C5 /* Sparkle.podspec */,
|
||||
72C4E02030340C2B00DAF61C /* generate_progress_tool_localizations.py */,
|
||||
);
|
||||
path = Configurations;
|
||||
sourceTree = "<group>";
|
||||
@@ -3138,9 +3145,11 @@
|
||||
72C56E262F04C28B0005A484 /* testreleasenotes.html in Resources */,
|
||||
723AD12F29922B5F006BB02F /* test-dangerous-link.xml in Resources */,
|
||||
72EB736129BEB36100FBCEE7 /* DevSignedAppVersion2.zip in Resources */,
|
||||
725EA4B23027D2AF0041BFA6 /* test-package-update.xml in Resources */,
|
||||
723EDC3F26885A8E000BCBA4 /* testappcast_channels.xml in Resources */,
|
||||
720DC50427A51A6500DFF3EC /* testappcast_minimumAutoupdateVersionSkipping.xml in Resources */,
|
||||
72E6D9712C04DE1A005496E4 /* SparkleTestCodeSign_pkg.dmg in Resources */,
|
||||
72C6F2DD303BE80200D39EF2 /* SparkleTestCodeSignApp.license.large-formatted-multi-lang-text.dmg in Resources */,
|
||||
72526BE62EF3349D005791ED /* testappcast_minimumUpdateVersion.xml in Resources */,
|
||||
72AC6B2E1B9B218C00F62325 /* SparkleTestCodeSignApp.dmg in Resources */,
|
||||
C23E885B1BE7B24F0050BB73 /* SparkleTestCodeSignApp.enc.dmg in Resources */,
|
||||
@@ -3168,6 +3177,7 @@
|
||||
722545B626805FF80036465C /* testappcast_info_updates.xml in Resources */,
|
||||
723414172EBFB482009727E0 /* testappcast_arm64HardwareRequirement.xml in Resources */,
|
||||
7202DC9A269ABD3500737EC4 /* testappcast_phasedRollout.xml in Resources */,
|
||||
72C6F2DB303BE56100D39EF2 /* SparkleTestCodeSignApp.license.no-text.dmg in Resources */,
|
||||
5F1510A21C96E591006E1629 /* testnamespaces.xml in Resources */,
|
||||
729F7EAC27366353004592DC /* test-links.xml in Resources */,
|
||||
);
|
||||
@@ -3182,6 +3192,7 @@
|
||||
72E45CFC1B641961005C701A /* sparkletestcast.xml in Resources */,
|
||||
725F97A61C8B304D00265BE4 /* SUInstallUpdateViewController.xib in Resources */,
|
||||
723ABE02259A9E9E00BDB4FA /* MainMenu.xib in Resources */,
|
||||
723F25FE2E75F76400462999 /* AppIcon.icon in Resources */,
|
||||
72F0EC45278A55CA002A876A /* screenshot.png in Resources */,
|
||||
72E45CF81B640DAE005C701A /* SUUpdateSettingsWindowController.xib in Resources */,
|
||||
);
|
||||
@@ -3191,7 +3202,6 @@
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72EB87EC1CB8887E00C37F42 /* SUStatus.xib in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -3244,7 +3254,6 @@
|
||||
61AAE8280A321A7F00D8810D /* Sparkle.strings in Resources */,
|
||||
1EAA4C8B2132C7BF00604473 /* ReleaseNotesColorStyle.css in Resources */,
|
||||
72FE54422E56A14100227A91 /* SUUpdateAlert.xib in Resources */,
|
||||
55C14BEF136EF21700649790 /* SUStatus.xib in Resources */,
|
||||
729C51282E58015600D7365A /* SUUpdatePermissionPrompt.xib in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
@@ -3378,7 +3387,6 @@
|
||||
14652F8219A9746000959E44 /* SULog.m in Sources */,
|
||||
7267E5F81D3D91A800D1BF90 /* SUPipedUnarchiver.m in Sources */,
|
||||
7267E5F71D3D919600D1BF90 /* SUPlainInstaller.m in Sources */,
|
||||
72BEBFEF1D7287570019146B /* SUSpotlightImporterTest.swift in Sources */,
|
||||
7267E5ED1D3D912E00D1BF90 /* SUUnarchiver.m in Sources */,
|
||||
72316BD41E0DB37E0039EFD9 /* SUUnarchiverNotifier.m in Sources */,
|
||||
7210C7681B9A9A1500EB90AC /* SUUnarchiverTest.swift in Sources */,
|
||||
|
||||
@@ -59,6 +59,9 @@
|
||||
isEnabled = "NO">
|
||||
</EnvironmentVariable>
|
||||
</EnvironmentVariables>
|
||||
<MetalAPIValidationSettings
|
||||
isEnabled = "No">
|
||||
</MetalAPIValidationSettings>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
buildConfiguration = "Release"
|
||||
|
||||
Vendored
+3
-3
@@ -91,7 +91,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Cancel";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Cancel Update";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -124,7 +124,7 @@
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Install on Quit";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Installing update…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -184,7 +184,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "Update Installed";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Updating %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
+2
-2
@@ -30,13 +30,13 @@
|
||||
<string>1</string>
|
||||
<key>CFBundleLocalizations</key>
|
||||
<array>
|
||||
<string>en</string>
|
||||
<string>ca</string>
|
||||
<string>ar</string>
|
||||
<string>ca</string>
|
||||
<string>cs</string>
|
||||
<string>da</string>
|
||||
<string>de</string>
|
||||
<string>el</string>
|
||||
<string>en</string>
|
||||
<string>es</string>
|
||||
<string>fa</string>
|
||||
<string>fi</string>
|
||||
|
||||
+9
-38
@@ -11,7 +11,6 @@
|
||||
#import "SPUMessageTypes.h"
|
||||
#import "SULog.h"
|
||||
#import "SULog+NSError.h"
|
||||
#import "SUApplicationInfo.h"
|
||||
#import "SPUInstallerAgentProtocol.h"
|
||||
#import "SUInstallerAgentInitiationProtocol.h"
|
||||
#import "StatusInfo.h"
|
||||
@@ -114,8 +113,6 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
|
||||
_application = application;
|
||||
_delegate = delegate;
|
||||
|
||||
[delegate loadLocalizationStringsFromHost:host];
|
||||
|
||||
_connection.exportedInterface = [NSXPCInterface interfaceWithProtocol:@protocol(SPUInstallerAgentProtocol)];
|
||||
_connection.exportedObject = self;
|
||||
|
||||
@@ -192,33 +189,17 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
|
||||
|
||||
[_statusInfo invalidate];
|
||||
[_connection invalidate];
|
||||
|
||||
// Remove the agent bundle; it is assumed this bundle is in a temporary/cache/support directory
|
||||
NSError *theError = nil;
|
||||
NSString *bundlePath = [[NSBundle mainBundle] bundlePath];
|
||||
|
||||
if (![[NSFileManager defaultManager] removeItemAtPath:bundlePath error:&theError]) {
|
||||
SULog(SULogLevelError, @"Couldn't remove agent bundle: %@.", theError);
|
||||
} else {
|
||||
// There should be nothing else in the parent temporary directory given to us,
|
||||
// so let us try to remove it. Note rmdir() will fail if there are unexpectably other
|
||||
// items present
|
||||
NSString *parentDirectory = bundlePath.stringByDeletingLastPathComponent;
|
||||
const char *fileSystemRepresentation = parentDirectory.fileSystemRepresentation;
|
||||
if (fileSystemRepresentation != NULL) {
|
||||
if (rmdir(fileSystemRepresentation) != 0) {
|
||||
SULog(SULogLevelError, @"Failed to remove parent agent bundle directory: %@: %d", parentDirectory, errno);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
exit(status);
|
||||
}
|
||||
|
||||
- (NSArray<NSRunningApplication *> *)runningApplicationsWithBundle:(NSBundle *)bundle SPU_OBJC_DIRECT
|
||||
{
|
||||
// Resolve symlinks otherwise when we compare file paths, we may not realize two paths that are represented differently are the same
|
||||
NSArray<NSString *> *bundlePathComponents = bundle.bundlePath.stringByResolvingSymlinksInPath.pathComponents;
|
||||
// Resolve symlinks otherwise when we compare file paths, we may not realize two paths that are represented differently are the same.
|
||||
// Make sure to use -[NSURL URLByResolvingSymlinksInPath] rather than -[NSString stringByResolvingSymlinksInPath]
|
||||
// because the former will normalize it to proper file system representation.
|
||||
// This is also done when retrieving NSRunningApplication path further below
|
||||
NSArray<NSString *> *bundlePathComponents = bundle.bundleURL.URLByResolvingSymlinksInPath.pathComponents;
|
||||
NSString *bundleIdentifier = bundle.bundleIdentifier;
|
||||
|
||||
NSMutableArray<NSRunningApplication *> *matchedRunningApplications = [[NSMutableArray alloc] init];
|
||||
@@ -231,7 +212,7 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
|
||||
NSMutableArray<NSRunningApplication *> *potentialMatchingTranslocatedRunningApplications = [[NSMutableArray alloc] init];
|
||||
|
||||
BOOL needsToHandleImproperBundles;
|
||||
if (@available(macOS 16, *)) {
|
||||
if (@available(macOS 26, *)) {
|
||||
needsToHandleImproperBundles = NO;
|
||||
} else {
|
||||
needsToHandleImproperBundles = YES;
|
||||
@@ -443,19 +424,9 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
|
||||
{
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
if (!self->_willTerminate) {
|
||||
// Show app icon in the dock
|
||||
ProcessSerialNumber psn = { 0, kCurrentProcess };
|
||||
TransformProcessType(&psn, kProcessTransformToForegroundApplication);
|
||||
|
||||
// Note: the application icon needs to be set after showing the icon in the dock
|
||||
self->_application.applicationIconImage = [SUApplicationInfo bestIconForHost:self->_oldHost];
|
||||
|
||||
// Activate ourselves otherwise we will probably be in the background
|
||||
if (@available(macOS 14, *)) {
|
||||
[self->_application activate];
|
||||
} else {
|
||||
[self->_application activateIgnoringOtherApps:YES];
|
||||
}
|
||||
// See comments in -[SPUStandardUserDriver _activateApplication] for why -activate is not used
|
||||
[self->_application activateIgnoringOtherApps:YES];
|
||||
|
||||
[self->_delegate installerProgressShouldDisplayWithHost:self->_oldHost];
|
||||
}
|
||||
|
||||
@@ -14,7 +14,6 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@protocol InstallerProgressDelegate <NSObject>
|
||||
|
||||
- (void)loadLocalizationStringsFromHost:(SUHost *)host;
|
||||
- (void)installerProgressShouldDisplayWithHost:(SUHost *)host;
|
||||
- (void)installerProgressShouldStop;
|
||||
|
||||
|
||||
@@ -0,0 +1,189 @@
|
||||
//
|
||||
// SPUInstallerProgressLocalizedStrings.h
|
||||
// Sparkle
|
||||
//
|
||||
// This file is auto-generated by Configurations/generate_progress_tool_localizations.py
|
||||
// Do not edit by hand. Re-run the script after changing the strings below in
|
||||
// Sparkle/*.lproj/Sparkle.strings
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
static NSDictionary<NSString *, NSDictionary<NSString *, NSString *> *> *const SPUInstallerProgressLocalizedStringsTable = @{
|
||||
@"ar": @{
|
||||
@"Cancel Update": @"إلغاء التحديث",
|
||||
@"Updating %@": @"تحديث %@",
|
||||
},
|
||||
@"ca": @{
|
||||
@"Installing update…": @"Instal·lant l'actualització…",
|
||||
@"Updating %@": @"Actualitzant %@",
|
||||
},
|
||||
@"cs": @{
|
||||
@"Cancel Update": @"Zrušit aktualizaci",
|
||||
@"Installing update…": @"Instaluje se aktualizace…",
|
||||
@"Updating %@": @"Aktualizuje se %@",
|
||||
},
|
||||
@"da": @{
|
||||
@"Cancel Update": @"Annuller opdatering",
|
||||
@"Installing update…": @"Installerer opdatering…",
|
||||
@"Updating %@": @"Opdaterer %@",
|
||||
},
|
||||
@"de": @{
|
||||
@"Cancel Update": @"Aktualisierung abbrechen",
|
||||
@"Installing update…": @"Update installieren …",
|
||||
@"Updating %@": @"Aktualisierung von %@",
|
||||
},
|
||||
@"el": @{
|
||||
@"Cancel Update": @"Ακύρωση Ενημέρωσης",
|
||||
@"Installing update…": @"Εγκατάσταση ενημέρωσης…",
|
||||
@"Updating %@": @"Ενημέρωση %@",
|
||||
},
|
||||
@"en": @{
|
||||
@"Cancel Update": @"Cancel Update",
|
||||
@"Installing update…": @"Installing update…",
|
||||
@"Updating %@": @"Updating %@",
|
||||
},
|
||||
@"es": @{
|
||||
@"Cancel Update": @"Cancelar actualización",
|
||||
@"Installing update…": @"Instalando actualización…",
|
||||
@"Updating %@": @"Actualizando %@",
|
||||
},
|
||||
@"fa": @{
|
||||
@"Cancel Update": @"لغو بهروزرسانی",
|
||||
@"Installing update…": @"در حال نصب بهروزرسانی",
|
||||
@"Updating %@": @"%@ در حال بهروزرسانی",
|
||||
},
|
||||
@"fi": @{
|
||||
@"Cancel Update": @"Peruuta päivitykset",
|
||||
@"Installing update…": @"Päivitys asennetaan…",
|
||||
@"Updating %@": @"Päivitetään %@",
|
||||
},
|
||||
@"fr": @{
|
||||
@"Cancel Update": @"Annuler la mise à jour",
|
||||
@"Installing update…": @"Installation de la mise à jour…",
|
||||
@"Updating %@": @"Mise à jour de %@",
|
||||
},
|
||||
@"he": @{
|
||||
@"Cancel Update": @"בטל את העדכון",
|
||||
@"Installing update…": @"מתקין את העדכון",
|
||||
@"Updating %@": @"עדכון %@",
|
||||
},
|
||||
@"hr": @{
|
||||
@"Cancel Update": @"Prekini aktualiziranje",
|
||||
@"Installing update…": @"Instaliranje nadogradnje …",
|
||||
@"Updating %@": @"%@ se aktualizira",
|
||||
},
|
||||
@"hu": @{
|
||||
@"Cancel Update": @"Frissítés megszakítása",
|
||||
@"Updating %@": @"%@ frissítése",
|
||||
},
|
||||
@"is": @{
|
||||
@"Installing update…": @"Set inn uppfærslu…",
|
||||
@"Updating %@": @"Uppfæri %@",
|
||||
},
|
||||
@"it": @{
|
||||
@"Cancel Update": @"Annulla Aggiornamento",
|
||||
@"Installing update…": @"Installazione aggiornamento in corso…",
|
||||
@"Updating %@": @"Aggiornamento di %@",
|
||||
},
|
||||
@"ja": @{
|
||||
@"Cancel Update": @"アップデートを中止",
|
||||
@"Installing update…": @"アップデートをインストールしています…",
|
||||
@"Updating %@": @"%@をアップデート中",
|
||||
},
|
||||
@"ko": @{
|
||||
@"Cancel Update": @"업데이트 취소",
|
||||
@"Installing update…": @"설치 중…",
|
||||
@"Updating %@": @"%@ 업데이트 중",
|
||||
},
|
||||
@"nb": @{
|
||||
@"Cancel Update": @"Avbryt oppdateringen",
|
||||
@"Installing update…": @"Installerer oppdateringen…",
|
||||
@"Updating %@": @"Oppdaterer %@",
|
||||
},
|
||||
@"nl": @{
|
||||
@"Cancel Update": @"Annuleer update",
|
||||
@"Installing update…": @"Update installeren…",
|
||||
@"Updating %@": @"%@ bijwerken…",
|
||||
},
|
||||
@"nn": @{
|
||||
@"Cancel Update": @"Avbryt oppdateringa",
|
||||
@"Installing update…": @"Installerer oppdateringa…",
|
||||
@"Updating %@": @"Oppdaterer %@",
|
||||
},
|
||||
@"pl": @{
|
||||
@"Cancel Update": @"Anuluj uaktualnianie",
|
||||
@"Installing update…": @"Instalowanie uaktualnienia…",
|
||||
@"Updating %@": @"Uaktualniam %@",
|
||||
},
|
||||
@"pt-BR": @{
|
||||
@"Cancel Update": @"Cancelar Atualização",
|
||||
@"Installing update…": @"Instalando atualização…",
|
||||
@"Updating %@": @"Atualizando o app %@",
|
||||
},
|
||||
@"pt-PT": @{
|
||||
@"Cancel Update": @"Cancelar atualização",
|
||||
@"Installing update…": @"A instalar atualização…",
|
||||
@"Updating %@": @"A atualizar o %@",
|
||||
},
|
||||
@"ro": @{
|
||||
@"Cancel Update": @"Anulează actualizarea",
|
||||
@"Installing update…": @"Instalează actualizarea…",
|
||||
@"Updating %@": @"Actualizează %@",
|
||||
},
|
||||
@"ru": @{
|
||||
@"Cancel Update": @"Отменить обновление",
|
||||
@"Installing update…": @"Устанавливаю обновление…",
|
||||
@"Updating %@": @"Обновляю %@",
|
||||
},
|
||||
@"sk": @{
|
||||
@"Cancel Update": @"Zrušiť aktualizáciu",
|
||||
@"Installing update…": @"Inštaluje sa aktualizácia…",
|
||||
@"Updating %@": @"Aktualizuje sa %@",
|
||||
},
|
||||
@"sl": @{
|
||||
@"Cancel Update": @"Prekliči posodabljanje",
|
||||
@"Installing update…": @"Nameščanje posodobitve …",
|
||||
@"Updating %@": @"Posodabljam %@",
|
||||
},
|
||||
@"sv": @{
|
||||
@"Cancel Update": @"Avbryt uppdatering",
|
||||
@"Installing update…": @"Installerar uppdatering…",
|
||||
@"Updating %@": @"Uppdaterar %@",
|
||||
},
|
||||
@"th": @{
|
||||
@"Cancel Update": @"ยกเลิกอัพเดท",
|
||||
@"Installing update…": @"กำลังติดตั้งอัพเดท…",
|
||||
@"Updating %@": @"กำลังอัพเดท %@",
|
||||
},
|
||||
@"tr": @{
|
||||
@"Cancel Update": @"Güncellemeden Vazgeç",
|
||||
@"Installing update…": @"Güncelleme kuruluyor…",
|
||||
@"Updating %@": @"%@ güncelleniyor",
|
||||
},
|
||||
@"uk": @{
|
||||
@"Cancel Update": @"Відмінити оновлення",
|
||||
@"Installing update…": @"Встановлюю оновлення…",
|
||||
@"Updating %@": @"Оновлюю %@",
|
||||
},
|
||||
@"vi": @{
|
||||
@"Cancel Update": @"Hủy cập nhật",
|
||||
@"Installing update…": @"Đang cài đặt bản cập nhật…",
|
||||
@"Updating %@": @"Đang cập nhật %@",
|
||||
},
|
||||
@"zh_CN": @{
|
||||
@"Cancel Update": @"取消更新",
|
||||
@"Installing update…": @"正在安装更新…",
|
||||
@"Updating %@": @"正在更新%@",
|
||||
},
|
||||
@"zh_HK": @{
|
||||
@"Cancel Update": @"取消更新",
|
||||
@"Installing update…": @"正在安裝更新⋯",
|
||||
@"Updating %@": @"正在更新 %@",
|
||||
},
|
||||
@"zh_TW": @{
|
||||
@"Cancel Update": @"取消更新",
|
||||
@"Installing update…": @"正在安裝更新項目⋯",
|
||||
@"Updating %@": @"正在更新%@",
|
||||
},
|
||||
};
|
||||
+31
-76
@@ -10,95 +10,50 @@
|
||||
#import "ShowInstallerProgress.h"
|
||||
#import "SUStatusController.h"
|
||||
#import "SUHost.h"
|
||||
#import "SULocalizations.h"
|
||||
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
#import "SPUInstallerProgressLocalizedStrings.h"
|
||||
#endif
|
||||
|
||||
@implementation ShowInstallerProgress
|
||||
{
|
||||
SUStatusController *_statusController;
|
||||
NSString *_updatingString;
|
||||
NSString *_cancelUpdateTitle;
|
||||
NSString *_installingUpdateTitle;
|
||||
}
|
||||
|
||||
- (void)loadLocalizationStringsFromHost:(SUHost *)host
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
// SPUInstallerProgressLocalizedStringsTable is generated at development time (by Configurations/generate_progress_tool_localizations.py)
|
||||
static NSDictionary<NSString *, NSString *> *SUBestMatchingInstallerProgressLocalizedStrings(void)
|
||||
{
|
||||
// Try to retrieve localization strings from the old bundle if possible
|
||||
// We won't display these strings until installerProgressShouldDisplayWithHost:
|
||||
// (which will be after the update is trusted)
|
||||
// If we fail to load localizations in any way, we default to English
|
||||
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
NSBundle *hostSparkleBundle;
|
||||
{
|
||||
NSURL *hostSparkleURL = [host.bundle.privateFrameworksURL URLByAppendingPathComponent:@"Sparkle.framework" isDirectory:YES];
|
||||
if (hostSparkleURL == nil) {
|
||||
hostSparkleBundle = nil;
|
||||
} else {
|
||||
hostSparkleBundle = [NSBundle bundleWithURL:hostSparkleURL];
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
NSString *updatingString;
|
||||
{
|
||||
NSString *hostNameFromBundle = host.name;
|
||||
NSString *hostName = (hostNameFromBundle != nil) ? hostNameFromBundle : @"";
|
||||
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
{
|
||||
NSString *updatingFormatStringFromBundle = (hostSparkleBundle != nil) ? SULocalizedStringFromTableInBundle(@"Updating %@", @"Sparkle", hostSparkleBundle, nil) : nil;
|
||||
|
||||
if (updatingFormatStringFromBundle != nil) {
|
||||
// Replacing the %@ will be a bit safer than using +[NSString stringWithFormat:]
|
||||
updatingString = [updatingFormatStringFromBundle stringByReplacingOccurrencesOfString:@"%@" withString:hostName];
|
||||
} else {
|
||||
updatingString = [@"Updating " stringByAppendingString:hostName];
|
||||
}
|
||||
}
|
||||
#else
|
||||
{
|
||||
updatingString = [@"Updating " stringByAppendingString:hostName];
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
_updatingString = updatingString;
|
||||
|
||||
NSString *cancelUpdateTitle;
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
{
|
||||
NSString *cancelUpdateTitleFromBundle = (hostSparkleBundle != nil) ? SULocalizedStringFromTableInBundle(@"Cancel Update", @"Sparkle", hostSparkleBundle, @"") : nil;
|
||||
cancelUpdateTitle = (cancelUpdateTitleFromBundle != nil) ? cancelUpdateTitleFromBundle : @"Cancel Update";
|
||||
}
|
||||
#else
|
||||
{
|
||||
cancelUpdateTitle = @"Cancel Update";
|
||||
}
|
||||
#endif
|
||||
_cancelUpdateTitle = cancelUpdateTitle;
|
||||
|
||||
NSString *installingUpdateTitle;
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
{
|
||||
NSString *installingUpdateTitleFromBundle = (hostSparkleBundle != nil) ? SULocalizedStringFromTableInBundle(@"Installing update…", @"Sparkle", hostSparkleBundle, @"") : nil;
|
||||
installingUpdateTitle = (installingUpdateTitleFromBundle != nil) ? installingUpdateTitleFromBundle : @"Installing update…";
|
||||
}
|
||||
#else
|
||||
{
|
||||
installingUpdateTitle = @"Installing update…";
|
||||
}
|
||||
#endif
|
||||
|
||||
_installingUpdateTitle = installingUpdateTitle;
|
||||
NSArray<NSString *> *availableLocalizations = SPUInstallerProgressLocalizedStringsTable.allKeys;
|
||||
NSArray<NSString *> *preferredLocalizations = [NSBundle preferredLocalizationsFromArray:availableLocalizations];
|
||||
NSString *bestLocalization = preferredLocalizations.firstObject ?: @"en";
|
||||
return SPUInstallerProgressLocalizedStringsTable[bestLocalization] ?: SPUInstallerProgressLocalizedStringsTable[@"en"];
|
||||
}
|
||||
#endif
|
||||
|
||||
- (void)installerProgressShouldDisplayWithHost:(SUHost *)host
|
||||
{
|
||||
_statusController = [[SUStatusController alloc] initWithHost:host windowTitle:_updatingString centerPointValue:nil minimizable:NO closable:NO];
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
NSDictionary<NSString *, NSString *> *localizedStrings = SUBestMatchingInstallerProgressLocalizedStrings();
|
||||
#else
|
||||
NSDictionary<NSString *, NSString *> *localizedStrings = @{};
|
||||
#endif
|
||||
|
||||
NSString *hostNameFromBundle = host.name;
|
||||
NSString *hostName = (hostNameFromBundle != nil) ? hostNameFromBundle : @"";
|
||||
|
||||
NSString *updatingFormatString = localizedStrings[@"Updating %@"] ?: @"Updating %@";
|
||||
NSString *updatingString = [updatingFormatString stringByReplacingOccurrencesOfString:@"%@" withString:hostName];
|
||||
|
||||
NSString *cancelUpdateTitle = localizedStrings[@"Cancel Update"] ?: @"Cancel Update";
|
||||
|
||||
NSString *installingUpdateTitle = localizedStrings[@"Installing update…"] ?: @"Installing update…";
|
||||
|
||||
[_statusController setButtonTitle:_cancelUpdateTitle target:nil action:nil isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
|
||||
_statusController = [[SUStatusController alloc] initWithHost:host windowTitle:updatingString centerPointValue:nil minimizable:NO closable:NO];
|
||||
|
||||
[_statusController beginActionWithTitle:_installingUpdateTitle maxProgressValue:0 statusText:@""];
|
||||
[_statusController setButtonTitle:cancelUpdateTitle target:nil action:nil isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
|
||||
|
||||
[_statusController beginActionWithTitle:installingUpdateTitle maxProgressValue:0 statusText:@""];
|
||||
|
||||
[_statusController showWindow:self];
|
||||
}
|
||||
|
||||
Vendored
-51
@@ -41,17 +41,6 @@
|
||||
@end
|
||||
#endif
|
||||
|
||||
// Note: we don't want to directly pull in AppKit here especially if the main application does not need it
|
||||
@interface NSObject (ActivationAPIs)
|
||||
// NSApplication
|
||||
+ (id)sharedApplication;
|
||||
- (void)yieldActivationToApplication:(id)application;
|
||||
|
||||
// NSRunningApplication
|
||||
+ (NSArray *)runningApplicationsWithBundleIdentifier:(NSString *)bundleIdentifier;
|
||||
- (NSURL *)bundleURL;
|
||||
@end
|
||||
|
||||
@interface SPUInstallerDriver () <SUInstallerCommunicationProtocol>
|
||||
@end
|
||||
|
||||
@@ -557,46 +546,6 @@
|
||||
|
||||
_relaunch = relaunch;
|
||||
|
||||
// If AppKit is loaded, we will yield to our Sparkle progress app
|
||||
// This will let the system know it should be okay for the progress agent to activate itself (if necessary)
|
||||
// Note we don't want to directly pull in AppKit here especially if the main application does not need it
|
||||
if (showUI) {
|
||||
if (@available(macOS 14, *)) {
|
||||
// Make sure we are not root before using AppKit API
|
||||
if (geteuid() != 0) {
|
||||
Class applicationClass = NSClassFromString(@"NSApplication");
|
||||
if ([applicationClass respondsToSelector:@selector(sharedApplication)]) {
|
||||
NSObject *application = [applicationClass sharedApplication];
|
||||
|
||||
if ([application respondsToSelector:@selector(yieldActivationToApplication:)]) {
|
||||
Class runningApplicationClass = NSClassFromString(@"NSRunningApplication");
|
||||
if ([runningApplicationClass respondsToSelector:@selector(runningApplicationsWithBundleIdentifier:)]) {
|
||||
NSArray *runningApplications = [runningApplicationClass runningApplicationsWithBundleIdentifier:@SPARKLE_INSTALLER_PROGRESS_TOOL_BUNDLE_ID];
|
||||
|
||||
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
|
||||
|
||||
id targetRunningApplication = nil;
|
||||
for (id runningApplication in runningApplications) {
|
||||
if ([(NSObject *)runningApplication respondsToSelector:@selector(bundleURL)]) {
|
||||
NSURL *bundleURL = [(NSObject *)runningApplication bundleURL];
|
||||
|
||||
if (hostBundleIdentifier != nil && [bundleURL.pathComponents containsObject:hostBundleIdentifier]) {
|
||||
targetRunningApplication = runningApplication;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (targetRunningApplication != nil) {
|
||||
[application yieldActivationToApplication:targetRunningApplication];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The user can request trying to relaunch/quit the app multiple times
|
||||
// Avoid re-notifying the delegate twice
|
||||
if (!_notifiedDelegateInstallationWillFinish) {
|
||||
|
||||
Vendored
-5
@@ -21,10 +21,6 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPULocalCacheDirectory : NSObject
|
||||
// and then create a unique temporary directory inside it (using +createUniqueDirectoryInDirectory:)
|
||||
+ (NSString *)cachePathForBundleIdentifier:(NSString *)bundleIdentifier;
|
||||
|
||||
// Variant of cachePathForBundleIdentifier: that specifies a userName to create the cache path for
|
||||
// Only use this when running from as root
|
||||
+ (NSString *)cachePathForBundleIdentifier:(NSString *)bundleIdentifier userName:(NSString *)userName;
|
||||
|
||||
// Remove old files inside a directory
|
||||
// A caller may want to invoke this on a directory they own rather than remove and re-create an entire directory
|
||||
// This does nothing if the supplied directory does not exist yet
|
||||
@@ -33,7 +29,6 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPULocalCacheDirectory : NSObject
|
||||
// Create a unique directory inside a parent directory
|
||||
// The parent directory doesn't have to exist yet. If it doesn't exist, intermediate directories will be created.
|
||||
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory;
|
||||
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory intermediateDirectoryFileAttributes:(nullable NSDictionary<NSFileAttributeKey, id> *)attributes;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
Vendored
+25
-21
@@ -18,7 +18,27 @@ static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
|
||||
|
||||
+ (NSString *)_cachePathForCacheDirectory:(NSURL *)cacheURL bundleIdentifier:(NSString *)bundleIdentifier SPU_OBJC_DIRECT
|
||||
{
|
||||
NSString *resultPath = [[[cacheURL URLByAppendingPathComponent:bundleIdentifier isDirectory:YES] URLByAppendingPathComponent:@SPARKLE_BUNDLE_IDENTIFIER isDirectory:YES] path];
|
||||
NSString *appCacheIdentifier = bundleIdentifier;
|
||||
{
|
||||
// If an app has an ill-formed bundle identifier that ends with ".app" or ".service"
|
||||
// or anything similarly problematic, we will append ".sparkle" to it
|
||||
// so that the cache directory doesn't look like a protected bundle directory,
|
||||
// which can cause other systematic issues
|
||||
// https://github.com/sparkle-project/Sparkle/discussions/2881
|
||||
NSArray<NSString *> *problematicBundleIdentifierExtensions = @[@".app", @".service", @".xpc", @".appex", @".bundle", @".plugin", @".saver", @".kext"];
|
||||
|
||||
// Transforming the bundle identifier into a lowercased variant for suffix comparison
|
||||
// rather than case-insensitive comparing the pathExtension (which may return "" for ".app")
|
||||
NSString *lowercasedBundleIdentifier = bundleIdentifier.lowercaseString;
|
||||
for (NSString *badExtension in problematicBundleIdentifierExtensions) {
|
||||
if ([lowercasedBundleIdentifier hasSuffix:badExtension]) {
|
||||
appCacheIdentifier = [bundleIdentifier stringByAppendingString:@".sparkle"];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
NSString *resultPath = [[[cacheURL URLByAppendingPathComponent:appCacheIdentifier isDirectory:YES] URLByAppendingPathComponent:@SPARKLE_BUNDLE_IDENTIFIER isDirectory:YES] path];
|
||||
assert(resultPath != nil);
|
||||
|
||||
return resultPath;
|
||||
@@ -34,19 +54,6 @@ static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
|
||||
return [self _cachePathForCacheDirectory:cacheURL bundleIdentifier:bundleIdentifier];
|
||||
}
|
||||
|
||||
+ (NSString *)cachePathForBundleIdentifier:(NSString *)bundleIdentifier userName:(NSString *)userName
|
||||
{
|
||||
NSString *homeDirectory = NSHomeDirectoryForUser(userName);
|
||||
assert(homeDirectory != nil);
|
||||
|
||||
NSURL *homeDirectoryURL = [NSURL fileURLWithPath:homeDirectory isDirectory:YES];
|
||||
|
||||
NSURL *cacheURL = [[homeDirectoryURL URLByAppendingPathComponent:@"Library" isDirectory:YES] URLByAppendingPathComponent:@"Caches" isDirectory:YES];
|
||||
assert(cacheURL != nil);
|
||||
|
||||
return [self _cachePathForCacheDirectory:cacheURL bundleIdentifier:bundleIdentifier];
|
||||
}
|
||||
|
||||
+ (void)removeOldItemsInDirectory:(NSString *)directory
|
||||
{
|
||||
NSMutableArray<NSString *> *filePathsToRemove = [NSMutableArray array];
|
||||
@@ -76,11 +83,11 @@ static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
|
||||
}
|
||||
}
|
||||
|
||||
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory intermediateDirectoryFileAttributes:(NSDictionary<NSFileAttributeKey, id> *)intermediateDirectoryFileAttributes
|
||||
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory
|
||||
{
|
||||
NSFileManager *fileManager = [NSFileManager defaultManager];
|
||||
NSError *createError = nil;
|
||||
if (![fileManager createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:intermediateDirectoryFileAttributes error:&createError]) {
|
||||
if (![fileManager createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:nil error:&createError]) {
|
||||
SULog(SULogLevelError, @"Failed to create directory with intermediate components at %@ with error %@", directory, createError);
|
||||
return nil;
|
||||
}
|
||||
@@ -90,14 +97,11 @@ static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
|
||||
if ([templateString getFileSystemRepresentation:buffer maxLength:sizeof(buffer)]) {
|
||||
if (mkdtemp(buffer) != NULL) {
|
||||
return [[NSString alloc] initWithUTF8String:buffer];
|
||||
} else {
|
||||
SULog(SULogLevelError, @"Failed to create templated intermediate cache directory using mkdtemp() with error: %d", errno);
|
||||
}
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory
|
||||
{
|
||||
return [self createUniqueDirectoryInDirectory:directory intermediateDirectoryFileAttributes:nil];
|
||||
}
|
||||
|
||||
@end
|
||||
Vendored
+7
-9
@@ -128,11 +128,10 @@
|
||||
|
||||
- (void)_activateApplication SPU_OBJC_DIRECT
|
||||
{
|
||||
if (@available(macOS 14, *)) {
|
||||
[NSApp activate];
|
||||
} else {
|
||||
[NSApp activateIgnoringOtherApps:YES];
|
||||
}
|
||||
// -[NSApp activate] does not always work reliably from backgrounded apps when the user initiates checks for updates
|
||||
// from e.g. a menu bar. The OS should grant active focus to the appliation, but it is inconsistent (last tested on 26.5.1).
|
||||
// For now we will prefer the deprecated more reliant API
|
||||
[NSApp activateIgnoringOtherApps:YES];
|
||||
}
|
||||
|
||||
- (void)showUpdatePermissionRequest:(SPUUpdatePermissionRequest *)request reply:(void (^)(SUUpdatePermissionResponse *))reply
|
||||
@@ -547,7 +546,6 @@
|
||||
#endif
|
||||
|
||||
_checkingController = [[SUStatusController alloc] initWithHost:_host windowTitle:SULocalizedStringFromTableInBundle(@"Software Update", SPARKLE_TABLE, sparkleBundle, nil) centerPointValue:nil minimizable:NO closable:NO];
|
||||
[[_checkingController window] center]; // Force the checking controller to load its window.
|
||||
[_checkingController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Checking for updates…", SPARKLE_TABLE, sparkleBundle, nil) maxProgressValue:0.0 statusText:nil];
|
||||
[_checkingController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:self action:@selector(cancelCheckForUpdates:) isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
|
||||
|
||||
@@ -609,7 +607,7 @@
|
||||
alert.informativeText = error.localizedDescription;
|
||||
}
|
||||
|
||||
[alert addButtonWithTitle:SULocalizedStringFromTableInBundle(@"Cancel Update", SPARKLE_TABLE, sparkleBundle, nil)];
|
||||
[alert addButtonWithTitle:SULocalizedStringFromTableInBundle(@"Cancel Update", SPARKLE_TABLE, sparkleBundle, @"Run generate_progress_tool_localizations.py after updating.")];
|
||||
[self showAlert:alert secondaryAction:nil];
|
||||
|
||||
acknowledgement();
|
||||
@@ -766,7 +764,7 @@
|
||||
centerPointValue = nil;
|
||||
}
|
||||
|
||||
_statusController = [[SUStatusController alloc] initWithHost:_host windowTitle:[NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Updating %@", SPARKLE_TABLE, SUSparkleBundle(), nil), _host.name] centerPointValue:centerPointValue minimizable:minimizable closable:closable];
|
||||
_statusController = [[SUStatusController alloc] initWithHost:_host windowTitle:[NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Updating %@", SPARKLE_TABLE, SUSparkleBundle(), @"Run generate_progress_tool_localizations.py after updating."), _host.name] centerPointValue:centerPointValue minimizable:minimizable closable:closable];
|
||||
|
||||
if (_updateAlertWindowWasInactive) {
|
||||
[_statusController.window orderFront:nil];
|
||||
@@ -867,7 +865,7 @@
|
||||
|
||||
if (applicationTerminated) {
|
||||
// Note this will only show up if -showReadyToInstallAndRelaunch: was called beforehand
|
||||
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Installing update…", SPARKLE_TABLE, SUSparkleBundle(), @"Take care not to overflow the status window.") maxProgressValue:0.0 statusText:nil];
|
||||
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Installing update…", SPARKLE_TABLE, SUSparkleBundle(), @"Run generate_progress_tool_localizations.py after updating.") maxProgressValue:0.0 statusText:nil];
|
||||
[_statusController setButtonEnabled:NO];
|
||||
} else {
|
||||
// The "quit" event can always be canceled or delayed by the application we're updating
|
||||
|
||||
Vendored
+6
-4
@@ -145,7 +145,8 @@
|
||||
[dict setObject:descriptionDict forKey:SURSSElementDescription];
|
||||
}
|
||||
} else if ([name isEqualToString:SUAppcastElementReleaseNotesLink]) {
|
||||
NSString *releaseNotesLink = node.stringValue;
|
||||
// Trim whitespace to maintain backwards compatibility
|
||||
NSString *releaseNotesLink = [node.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
|
||||
if (releaseNotesLink != nil) {
|
||||
NSDictionary *attributes = [self attributesOfNode:(NSXMLElement *)node];
|
||||
|
||||
@@ -177,7 +178,7 @@
|
||||
NSMutableArray *names = [NSMutableArray array];
|
||||
NSEnumerator *childEnum = [[node children] objectEnumerator];
|
||||
for (NSXMLNode *child in childEnum) {
|
||||
NSString *childName = child.name;
|
||||
NSString *childName = [self sparkleNamespacedNameOfNode:child];
|
||||
if (childName) {
|
||||
[names addObject:childName];
|
||||
}
|
||||
@@ -187,12 +188,13 @@
|
||||
NSMutableSet *informationalUpdateVersions = [NSMutableSet set];
|
||||
NSEnumerator *childEnum = [[node children] objectEnumerator];
|
||||
for (NSXMLNode *child in childEnum) {
|
||||
if ([child.name isEqualToString:SUAppcastElementVersion]) {
|
||||
NSString *childName = [self sparkleNamespacedNameOfNode:child];
|
||||
if ([childName isEqualToString:SUAppcastElementVersion]) {
|
||||
NSString *version = child.stringValue;
|
||||
if (version != nil) {
|
||||
[informationalUpdateVersions addObject:version];
|
||||
}
|
||||
} else if ([child.name isEqualToString:SUAppcastElementBelowVersion]) {
|
||||
} else if ([childName isEqualToString:SUAppcastElementBelowVersion]) {
|
||||
NSString *version = child.stringValue;
|
||||
if (version != nil) {
|
||||
// Denote version is used as an upper bound by using '<'
|
||||
|
||||
Vendored
+1
-1
@@ -188,7 +188,7 @@ SU_EXPORT NS_SWIFT_SENDABLE @interface SUAppcastItem : NSObject<NSSecureCoding>
|
||||
|
||||
This version string should contain three period-separated components.
|
||||
|
||||
Example: @c 10.13.0
|
||||
Example: @c 12.0.0
|
||||
|
||||
Use `minimumOperatingSystemVersionIsOK` property to test if the current running system passes this requirement.
|
||||
|
||||
|
||||
Vendored
+16
-9
@@ -567,10 +567,10 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
|
||||
processedInfoURL = [NSURL URLWithString:infoLinkURLString];
|
||||
}
|
||||
|
||||
if ([processedInfoURL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [processedInfoURL.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
|
||||
if (processedInfoURL != nil && ([processedInfoURL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [processedInfoURL.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame)) {
|
||||
infoURL = processedInfoURL;
|
||||
} else {
|
||||
SULog(SULogLevelError, @"%@ -%@ Info URL must have a http or https URL scheme.", NSStringFromClass([self class]), NSStringFromSelector(_cmd));
|
||||
SULog(SULogLevelError, @"Info URL must have a http or https URL scheme: %@", infoLinkURLString);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -622,11 +622,11 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
|
||||
fileURL = [NSURL URLWithString:fileURLString];
|
||||
}
|
||||
|
||||
if ([fileURL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [fileURL.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
|
||||
if (fileURL != nil && ([fileURL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [fileURL.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame)) {
|
||||
_fileURL = fileURL;
|
||||
} else {
|
||||
if (error) {
|
||||
*error = @"File URLs must have a http or https URL scheme";
|
||||
*error = [NSString stringWithFormat:@"File URL must have a http or https URL scheme: %@", fileURLString];
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
@@ -773,6 +773,13 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
|
||||
chosenInstallationType = SPUInstallationTypeApplication;
|
||||
#endif
|
||||
|
||||
if (signingValidationStatus == SPUAppcastSigningValidationStatusFailed && ![chosenInstallationType isEqualToString:SPUInstallationTypeApplication]) {
|
||||
if (error != NULL) {
|
||||
*error = @"Package based install update is rejected because signing validation on feed failed";
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
_installationType = [chosenInstallationType copy];
|
||||
|
||||
NSString *enclosureDeltaSparkleExecutableSize = [enclosure objectForKey:SUAppcastAttributeDeltaFromSparkleExecutableSize];
|
||||
@@ -818,10 +825,10 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
|
||||
} else {
|
||||
url = [NSURL URLWithString:releaseNotesString];
|
||||
}
|
||||
if ([url.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [url.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
|
||||
if (url != nil && ([url.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [url.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame)) {
|
||||
_releaseNotesURL = url;
|
||||
} else {
|
||||
SULog(SULogLevelError, @"Release notes must have a http or https URL scheme.");
|
||||
SULog(SULogLevelError, @"Release notes must have a http or https URL scheme: %@", releaseNotesString);
|
||||
_releaseNotesURL = nil;
|
||||
}
|
||||
} else if ([_itemDescription hasPrefix:@"http://"] || [_itemDescription hasPrefix:@"https://"]) { // if the description starts with http:// or https:// use that.
|
||||
@@ -836,7 +843,7 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
|
||||
#endif
|
||||
];
|
||||
|
||||
long long releaseNotesLength = [(NSString *)[releaseNotesLinkDictionary objectForKey:@"length"] longLongValue];
|
||||
long long releaseNotesLength = [(NSString *)[releaseNotesLinkDictionary objectForKey:SUAppcastAttributeLength] longLongValue];
|
||||
_releaseNotesContentLength = (releaseNotesLength > 0) ? (uint64_t)releaseNotesLength : 0;
|
||||
}
|
||||
|
||||
@@ -850,10 +857,10 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
|
||||
} else {
|
||||
url = [NSURL URLWithString:fullReleaseNotesString];
|
||||
}
|
||||
if ([url.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [url.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
|
||||
if (url != nil && ([url.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [url.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame)) {
|
||||
_fullReleaseNotesURL = url;
|
||||
} else {
|
||||
SULog(SULogLevelError, @"Full release notes must have a http or https URL scheme.");
|
||||
SULog(SULogLevelError, @"Full release notes must have a http or https URL scheme: %@", fullReleaseNotesString);
|
||||
_fullReleaseNotesURL = nil;
|
||||
}
|
||||
} else {
|
||||
|
||||
Vendored
+24
@@ -58,6 +58,30 @@ SUFileManagerDefinitionAttribute
|
||||
*/
|
||||
- (BOOL)moveItemAtURL:(NSURL *)sourceURL toURL:(NSURL *)destinationURL error:(NSError **)error;
|
||||
|
||||
/**
|
||||
* Renames an item from a source to a destination assuming source and destination URLs have symbolic links resolved.
|
||||
* @param sourceURL A URL pointing to the item to rename. The item at this URL must exist.
|
||||
* @param destinationURL A URL pointing to the destination the item will be moved at.
|
||||
* @param error if an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
|
||||
* @return YES if the time was renamed successfully, otherwise NO along with a pouplated error object.
|
||||
*
|
||||
* sourceURL and destinationURL must reside on the same volume otherwise this operation will fail.
|
||||
* If any symbolic links are encountered in these paths during path resolution, this operation will fail.
|
||||
*/
|
||||
- (BOOL)renameItemAtResolvedSymlinkURL:(NSURL *)sourceURL toResolvedSymlinkURL:(NSURL *)destinationURL error:(NSError *__autoreleasing *)error;
|
||||
|
||||
/**
|
||||
* Returns a URL by resolving links in path.
|
||||
* @param url A URL pointing to a real file to resolve symlinks in path.
|
||||
* @param isDirectory Indicates if the URL is a directory.
|
||||
* @param error if an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
|
||||
* @return A URL that is resolved and has no symlinks in its path.
|
||||
*
|
||||
* This method is suitable to resolving a URL before passing it to -renameItemAtResolvedSymlinkURL:toResolvedSymlinkURL:error:
|
||||
* -[NSURL URLByResolvingSymlinksInPath] does not resolve symlinks for file paths starting with /private/ hence the need for this method.
|
||||
*/
|
||||
- (NSURL * _Nullable)resolveSymlinksInURL:(NSURL *)url isDirectory:(BOOL)isDirectory error:(NSError * __autoreleasing *)error;
|
||||
|
||||
/**
|
||||
* Swaps an original item with a new item atomically.
|
||||
* @param originalItemURL A URL pointing to the original item to replace. The item at this URL must exist.
|
||||
|
||||
Vendored
+111
-3
@@ -225,7 +225,28 @@ SPU_OBJC_DIRECT
|
||||
return [_fileManager moveItemAtURL:sourceURL toURL:destinationURL error:error];
|
||||
}
|
||||
|
||||
- (BOOL)swapItemAtURL:(NSURL *)originalItemURL withItemAtURL:(NSURL *)newItemURL error:(NSError * __autoreleasing *)error
|
||||
- (NSURL * _Nullable)resolveSymlinksInURL:(NSURL *)url isDirectory:(BOOL)isDirectory error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
char path[PATH_MAX] = {0};
|
||||
if (![url.path getFileSystemRepresentation:path maxLength:sizeof(path)]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to retrieve file system representation before resolving symlinks in %@", url.path] }];
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
char resolvedPath[PATH_MAX] = {0};
|
||||
if (realpath(path, resolvedPath) == NULL) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to resolve symlinks in %@", url.path] }];
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
return [[NSURL alloc] initFileURLWithFileSystemRepresentation:resolvedPath isDirectory:isDirectory relativeToURL:nil];
|
||||
}
|
||||
|
||||
static BOOL renameFile(NSURL *originalItemURL, NSURL *newItemURL, unsigned int renameFlags, NSError * __autoreleasing *error)
|
||||
{
|
||||
char originalPath[PATH_MAX] = {0};
|
||||
if (![originalItemURL.path getFileSystemRepresentation:originalPath maxLength:sizeof(originalPath)]) {
|
||||
@@ -243,10 +264,10 @@ SPU_OBJC_DIRECT
|
||||
return NO;
|
||||
}
|
||||
|
||||
int status = renamex_np(newPath, originalPath, RENAME_SWAP);
|
||||
int status = renamex_np(originalPath, newPath, renameFlags);
|
||||
if (status != 0) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to replace %@ with %@.", originalItemURL.lastPathComponent, newItemURL.lastPathComponent] }];
|
||||
*error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to renamex_np %@ with %@.", originalItemURL.lastPathComponent, newItemURL.lastPathComponent] }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
@@ -254,6 +275,93 @@ SPU_OBJC_DIRECT
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (BOOL)renameItemAtResolvedSymlinkURL:(NSURL *)sourceURL toResolvedSymlinkURL:(NSURL *)destinationURL error:(NSError *__autoreleasing *)error
|
||||
{
|
||||
if (@available(macOS 13, *)) {
|
||||
// RENAME_NOFOLLOW_ANY option requires macOS 13+
|
||||
return renameFile(sourceURL, destinationURL, RENAME_NOFOLLOW_ANY, error);
|
||||
}
|
||||
|
||||
// The old path for renaming the file will involve opening file descriptors to parent directories
|
||||
// and using renameat() without following any symlinks
|
||||
|
||||
NSURL *sourceParentDirectoryURL = sourceURL.URLByDeletingLastPathComponent;
|
||||
|
||||
char sourceParentDirectoryPath[PATH_MAX] = {0};
|
||||
if (![sourceParentDirectoryURL getFileSystemRepresentation:sourceParentDirectoryPath maxLength:sizeof(sourceParentDirectoryPath)]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Source item parent directory %@ to rename cannot be represented as a valid file name", sourceParentDirectoryURL.lastPathComponent] }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
char sourceLastPathComponentPath[PATH_MAX] = {0};
|
||||
if (![sourceURL.lastPathComponent getFileSystemRepresentation:sourceLastPathComponentPath maxLength:sizeof(sourceLastPathComponentPath)]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Source item last path component %@ to rename cannot be represented as a valid file name", sourceURL.lastPathComponent] }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
char destinationParentDirectoryPath[PATH_MAX] = {0};
|
||||
NSURL *destinationParentDirectoryURL = destinationURL.URLByDeletingLastPathComponent;
|
||||
if (![destinationParentDirectoryURL getFileSystemRepresentation:destinationParentDirectoryPath maxLength:sizeof(destinationParentDirectoryPath)]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Destination item parent directory %@ to rename cannot be represented as a valid file name", destinationParentDirectoryURL.lastPathComponent] }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
char destinationLastPathComponentPath[PATH_MAX] = {0};
|
||||
if (![destinationURL.lastPathComponent getFileSystemRepresentation:destinationLastPathComponentPath maxLength:sizeof(destinationLastPathComponentPath)]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Destination item last path component %@ to rename cannot be represented as a valid file name", destinationURL.lastPathComponent] }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
// sourceURL and destinationURL is required to have symlinks already resolved so we will use O_NOFOLLOW_ANY to open the parent directories without following symlinks in any of intermediate directories
|
||||
|
||||
int sourceParentDirectoryFileDescriptor = open(sourceParentDirectoryPath, O_RDONLY | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW_ANY);
|
||||
if (sourceParentDirectoryFileDescriptor == -1) {
|
||||
if (error != nil) {
|
||||
*error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to open file descriptor to %@", sourceParentDirectoryURL.path.lastPathComponent] }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
int destinationParentDirectoryFileDescriptor = open(destinationParentDirectoryPath, O_RDONLY | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW_ANY);
|
||||
if (destinationParentDirectoryFileDescriptor == -1) {
|
||||
if (error != nil) {
|
||||
*error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to open file descriptor to %@", destinationParentDirectoryURL.path.lastPathComponent] }];
|
||||
}
|
||||
close(sourceParentDirectoryFileDescriptor);
|
||||
return NO;
|
||||
}
|
||||
|
||||
BOOL success = (renameat(sourceParentDirectoryFileDescriptor, sourceLastPathComponentPath, destinationParentDirectoryFileDescriptor, destinationLastPathComponentPath) == 0);
|
||||
if (!success) {
|
||||
if (error != nil) {
|
||||
*error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to rename '%@' to '%@'", sourceURL.path, destinationURL.path] }];
|
||||
}
|
||||
}
|
||||
|
||||
if (sourceParentDirectoryFileDescriptor != -1) {
|
||||
close(sourceParentDirectoryFileDescriptor);
|
||||
}
|
||||
|
||||
if (destinationParentDirectoryFileDescriptor != -1) {
|
||||
close(destinationParentDirectoryFileDescriptor);
|
||||
}
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
- (BOOL)swapItemAtURL:(NSURL *)originalItemURL withItemAtURL:(NSURL *)newItemURL error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
return renameFile(originalItemURL, newItemURL, RENAME_SWAP, error);
|
||||
}
|
||||
|
||||
- (BOOL)changeOwnerAndGroupOfItemAtURL:(NSURL *)targetURL ownerID:(uid_t)ownerID groupID:(gid_t)groupID error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
char path[PATH_MAX] = {0};
|
||||
|
||||
Vendored
+4
-6
@@ -22,12 +22,10 @@ static void SULogErrors(NSArray<NSError *> *errors, int recursionLimit)
|
||||
|
||||
NSDictionary<NSErrorUserInfoKey, id> *userInfo = error.userInfo;
|
||||
|
||||
if (@available(macOS 11.3, *)) {
|
||||
NSArray<NSError *> *underlyingErrors = userInfo[NSMultipleUnderlyingErrorsKey];
|
||||
if (underlyingErrors != nil) {
|
||||
SULogErrors(underlyingErrors, recursionLimit - 1);
|
||||
continue;
|
||||
}
|
||||
NSArray<NSError *> *underlyingErrors = userInfo[NSMultipleUnderlyingErrorsKey];
|
||||
if (underlyingErrors != nil) {
|
||||
SULogErrors(underlyingErrors, recursionLimit - 1);
|
||||
continue;
|
||||
}
|
||||
|
||||
NSError *underlyingError = userInfo[NSUnderlyingErrorKey];
|
||||
|
||||
Vendored
-124
@@ -1,124 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24764" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="macosx"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24764"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<customObject id="-2" userLabel="File's Owner" customClass="SUStatusController">
|
||||
<connections>
|
||||
<outlet property="_actionButton" destination="12" id="0jE-Zn-L18"/>
|
||||
<outlet property="_progressBar" destination="11" id="Cwm-99-fCT"/>
|
||||
<outlet property="_statusTextField" destination="16" id="oOr-uc-6cX"/>
|
||||
<outlet property="window" destination="5" id="25"/>
|
||||
</connections>
|
||||
</customObject>
|
||||
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
|
||||
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
|
||||
<window identifier="SUStatus" title="Set in Code" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window">
|
||||
<windowStyleMask key="styleMask" titled="YES"/>
|
||||
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
|
||||
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
|
||||
<rect key="contentRect" x="200" y="222" width="400" height="107"/>
|
||||
<rect key="screenRect" x="0.0" y="0.0" width="1470" height="923"/>
|
||||
<value key="minSize" type="size" width="213" height="107"/>
|
||||
<view key="contentView" misplaced="YES" id="6">
|
||||
<rect key="frame" x="0.0" y="0.0" width="400" height="107"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="7">
|
||||
<rect key="frame" x="20" y="42" width="64" height="64"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="64" id="BT1-iv-l2H"/>
|
||||
<constraint firstAttribute="width" constant="64" id="eYK-yn-PVe"/>
|
||||
</constraints>
|
||||
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="NSApplicationIcon" id="53"/>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="applicationIcon" id="9"/>
|
||||
</connections>
|
||||
</imageView>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="E7u-iB-1VW" userLabel="Status text and progress">
|
||||
<rect key="frame" x="92" y="52" width="288" height="44"/>
|
||||
<subviews>
|
||||
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="8">
|
||||
<rect key="frame" x="-2" y="28" width="292" height="16"/>
|
||||
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Status Text (set by loc. string in code)" id="54">
|
||||
<font key="font" metaFont="systemBold"/>
|
||||
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="title" id="26"/>
|
||||
</connections>
|
||||
</textField>
|
||||
<progressIndicator wantsLayer="YES" verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="11">
|
||||
<rect key="frame" x="0.0" y="0.0" width="288" height="20"/>
|
||||
<connections>
|
||||
<binding destination="-2" name="maxValue" keyPath="maxProgressValue" id="13"/>
|
||||
<binding destination="-2" name="value" keyPath="progressValue" previousBinding="13" id="27"/>
|
||||
</connections>
|
||||
</progressIndicator>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="8" secondAttribute="trailing" id="9Rq-vq-cJo"/>
|
||||
<constraint firstAttribute="bottom" secondItem="11" secondAttribute="bottom" id="PDQ-9x-h82"/>
|
||||
<constraint firstItem="8" firstAttribute="top" secondItem="E7u-iB-1VW" secondAttribute="top" id="Rtg-8u-ed1"/>
|
||||
<constraint firstAttribute="trailing" secondItem="11" secondAttribute="trailing" id="YFJ-Gi-yRc"/>
|
||||
<constraint firstItem="8" firstAttribute="leading" secondItem="E7u-iB-1VW" secondAttribute="leading" id="f16-mO-wfq"/>
|
||||
<constraint firstItem="11" firstAttribute="leading" secondItem="E7u-iB-1VW" secondAttribute="leading" id="jvG-0L-tcl"/>
|
||||
<constraint firstItem="11" firstAttribute="top" secondItem="8" secondAttribute="bottom" constant="8" symbolic="YES" id="mKu-OU-ujj"/>
|
||||
</constraints>
|
||||
</customView>
|
||||
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="12">
|
||||
<rect key="frame" x="280" y="20" width="100" height="24"/>
|
||||
<buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="55">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
</buttonCell>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="3tI-Ef-LLb"/>
|
||||
</constraints>
|
||||
<accessibility identifier="SUStatusButton"/>
|
||||
<connections>
|
||||
<binding destination="-2" name="title" keyPath="buttonTitle" id="21"/>
|
||||
</connections>
|
||||
</button>
|
||||
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="16">
|
||||
<rect key="frame" x="90" y="24" width="146" height="16"/>
|
||||
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Small System Font Text" id="56">
|
||||
<font key="font" metaFont="system"/>
|
||||
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="statusText" id="17"/>
|
||||
<binding destination="-2" name="hidden" keyPath="statusText" id="33">
|
||||
<dictionary key="options">
|
||||
<string key="NSValueTransformerName">NSIsNil</string>
|
||||
</dictionary>
|
||||
</binding>
|
||||
</connections>
|
||||
</textField>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="E7u-iB-1VW" secondAttribute="trailing" constant="20" symbolic="YES" id="3uo-mB-Q9M"/>
|
||||
<constraint firstItem="7" firstAttribute="top" secondItem="6" secondAttribute="top" constant="4" id="9Mg-Ac-X6m"/>
|
||||
<constraint firstItem="E7u-iB-1VW" firstAttribute="centerY" secondItem="7" secondAttribute="centerY" id="Jcg-BS-tJ1"/>
|
||||
<constraint firstItem="16" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="8" symbolic="YES" id="LTo-e9-myp"/>
|
||||
<constraint firstItem="7" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="20" symbolic="YES" id="ZLG-dr-gmv"/>
|
||||
<constraint firstItem="12" firstAttribute="top" secondItem="E7u-iB-1VW" secondAttribute="bottom" constant="8" id="dHH-r0-at5"/>
|
||||
<constraint firstItem="16" firstAttribute="firstBaseline" secondItem="12" secondAttribute="firstBaseline" id="dHQ-hW-3QN"/>
|
||||
<constraint firstAttribute="bottom" secondItem="12" secondAttribute="bottom" constant="20" symbolic="YES" id="iY3-LJ-ivz"/>
|
||||
<constraint firstItem="12" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="16" secondAttribute="trailing" constant="25" id="k07-gJ-v9t"/>
|
||||
<constraint firstAttribute="trailing" secondItem="12" secondAttribute="trailing" constant="20" symbolic="YES" id="onJ-J5-mra"/>
|
||||
<constraint firstItem="E7u-iB-1VW" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="8" symbolic="YES" id="wiO-j2-ud9"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<point key="canvasLocation" x="-158" y="132"/>
|
||||
</window>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="NSApplicationIcon" width="32" height="32"/>
|
||||
</resources>
|
||||
</document>
|
||||
Vendored
+140
-47
@@ -26,19 +26,15 @@ static NSString *const SUStatusControllerTouchBarIdentifier = @"" SPARKLE_BUNDLE
|
||||
|
||||
@implementation SUStatusController
|
||||
{
|
||||
NSString *_windowTitle;
|
||||
NSValue *_centerPointValue;
|
||||
NSString *_title;
|
||||
NSString *_buttonTitle;
|
||||
SUHost *_host;
|
||||
NSButton *_touchBarButton;
|
||||
|
||||
IBOutlet NSButton *_actionButton;
|
||||
IBOutlet NSTextField *_statusTextField;
|
||||
IBOutlet NSProgressIndicator *_progressBar;
|
||||
|
||||
BOOL _minimizable;
|
||||
BOOL _closable;
|
||||
|
||||
NSTextField *_titleField;
|
||||
NSButton *_actionButton;
|
||||
NSProgressIndicator *_progressBar;
|
||||
}
|
||||
|
||||
@synthesize title = _title;
|
||||
@@ -49,15 +45,145 @@ static NSString *const SUStatusControllerTouchBarIdentifier = @"" SPARKLE_BUNDLE
|
||||
|
||||
- (instancetype)initWithHost:(SUHost *)aHost windowTitle:(NSString *)windowTitle centerPointValue:(NSValue *)centerPointValue minimizable:(BOOL)minimizable closable:(BOOL)closable
|
||||
{
|
||||
self = [super initWithWindowNibName:@"SUStatus" owner:self];
|
||||
if (self)
|
||||
NSWindow *window;
|
||||
NSImageView *imageView;
|
||||
NSTextField *titleField;
|
||||
NSProgressIndicator *progressBar;
|
||||
NSButton *actionButton;
|
||||
NSTextField *statusTextField;
|
||||
{
|
||||
NSWindowStyleMask styleMask = NSWindowStyleMaskTitled;
|
||||
if (minimizable) {
|
||||
styleMask |= NSWindowStyleMaskMiniaturizable;
|
||||
}
|
||||
if (closable) {
|
||||
styleMask |= NSWindowStyleMaskClosable;
|
||||
}
|
||||
|
||||
window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 400, 107) styleMask:styleMask backing:NSBackingStoreBuffered defer:NO];
|
||||
window.identifier = @"SUStatus";
|
||||
window.title = windowTitle;
|
||||
window.releasedWhenClosed = NO;
|
||||
window.allowsToolTipsWhenApplicationIsInactive = NO;
|
||||
window.autorecalculatesKeyViewLoop = NO;
|
||||
// Don't let this window make other active windows exit in Stage Manager
|
||||
window.collectionBehavior = NSWindowCollectionBehaviorFullScreenAuxiliary;
|
||||
window.contentMinSize = NSMakeSize(213, 107);
|
||||
|
||||
NSView *contentView = window.contentView;
|
||||
|
||||
imageView = [[NSImageView alloc] initWithFrame:NSZeroRect];
|
||||
imageView.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
imageView.refusesFirstResponder = YES;
|
||||
imageView.imageAlignment = NSImageAlignLeft;
|
||||
imageView.imageScaling = NSImageScaleAxesIndependently;
|
||||
imageView.image = [SUApplicationInfo bestIconForHost:aHost];
|
||||
[contentView addSubview:imageView];
|
||||
|
||||
NSView *statusContainerView = [[NSView alloc] initWithFrame:NSZeroRect];
|
||||
statusContainerView.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
[contentView addSubview:statusContainerView];
|
||||
|
||||
titleField = [NSTextField labelWithString:@""];
|
||||
titleField.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
titleField.focusRingType = NSFocusRingTypeNone;
|
||||
titleField.font = [NSFont boldSystemFontOfSize:[NSFont systemFontSize]];
|
||||
titleField.textColor = [NSColor controlTextColor];
|
||||
[titleField setContentHuggingPriority:750 forOrientation:NSLayoutConstraintOrientationVertical];
|
||||
// Don't let the title string line wrap
|
||||
[titleField setContentCompressionResistancePriority:1000 forOrientation:NSLayoutConstraintOrientationHorizontal];
|
||||
[statusContainerView addSubview:titleField];
|
||||
|
||||
progressBar = [[NSProgressIndicator alloc] initWithFrame:NSZeroRect];
|
||||
progressBar.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
progressBar.wantsLayer = YES;
|
||||
progressBar.style = NSProgressIndicatorStyleBar;
|
||||
progressBar.indeterminate = YES;
|
||||
progressBar.maxValue = 100;
|
||||
[progressBar setContentHuggingPriority:750 forOrientation:NSLayoutConstraintOrientationVertical];
|
||||
[progressBar setUsesThreadedAnimation:YES];
|
||||
[statusContainerView addSubview:progressBar];
|
||||
|
||||
actionButton = [NSButton buttonWithTitle:@"" target:nil action:NULL];
|
||||
actionButton.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
if (@available(macOS 26, *)) {
|
||||
actionButton.controlSize = NSControlSizeLarge;
|
||||
}
|
||||
[actionButton setContentHuggingPriority:750 forOrientation:NSLayoutConstraintOrientationVertical];
|
||||
actionButton.accessibilityIdentifier = @"SUStatusButton";
|
||||
[contentView addSubview:actionButton];
|
||||
|
||||
statusTextField = [NSTextField labelWithString:@""];
|
||||
[statusTextField setFont:[NSFont monospacedDigitSystemFontOfSize:0 weight:NSFontWeightRegular]];
|
||||
statusTextField.translatesAutoresizingMaskIntoConstraints = NO;
|
||||
statusTextField.focusRingType = NSFocusRingTypeNone;
|
||||
statusTextField.textColor = [NSColor controlTextColor];
|
||||
[statusTextField setContentHuggingPriority:750 forOrientation:NSLayoutConstraintOrientationVertical];
|
||||
// Make horizontal compression resistance required for the status text field
|
||||
[statusTextField setContentCompressionResistancePriority:1000 forOrientation:NSLayoutConstraintOrientationHorizontal];
|
||||
[contentView addSubview:statusTextField];
|
||||
|
||||
[NSLayoutConstraint activateConstraints:@[
|
||||
// Status container's internal layout
|
||||
[NSLayoutConstraint constraintWithItem:statusContainerView attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual toItem:titleField attribute:NSLayoutAttributeTrailing multiplier:1 constant:0],
|
||||
[NSLayoutConstraint constraintWithItem:statusContainerView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:progressBar attribute:NSLayoutAttributeBottom multiplier:1 constant:0],
|
||||
[NSLayoutConstraint constraintWithItem:titleField attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:statusContainerView attribute:NSLayoutAttributeTop multiplier:1 constant:0],
|
||||
[NSLayoutConstraint constraintWithItem:statusContainerView attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual toItem:progressBar attribute:NSLayoutAttributeTrailing multiplier:1 constant:0],
|
||||
[NSLayoutConstraint constraintWithItem:titleField attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:statusContainerView attribute:NSLayoutAttributeLeading multiplier:1 constant:0],
|
||||
[NSLayoutConstraint constraintWithItem:progressBar attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:statusContainerView attribute:NSLayoutAttributeLeading multiplier:1 constant:0],
|
||||
[NSLayoutConstraint constraintWithItem:progressBar attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:titleField attribute:NSLayoutAttributeBottom multiplier:1 constant:8],
|
||||
|
||||
// imageView
|
||||
[imageView.widthAnchor constraintEqualToConstant:64],
|
||||
[imageView.heightAnchor constraintEqualToConstant:64],
|
||||
[NSLayoutConstraint constraintWithItem:imageView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:contentView attribute:NSLayoutAttributeTop multiplier:1 constant:4],
|
||||
[NSLayoutConstraint constraintWithItem:imageView attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:contentView attribute:NSLayoutAttributeLeading multiplier:1 constant:20],
|
||||
|
||||
// statusContainerView position
|
||||
[NSLayoutConstraint constraintWithItem:statusContainerView attribute:NSLayoutAttributeCenterY relatedBy:NSLayoutRelationEqual toItem:imageView attribute:NSLayoutAttributeCenterY multiplier:1 constant:0],
|
||||
[NSLayoutConstraint constraintWithItem:statusContainerView attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:imageView attribute:NSLayoutAttributeTrailing multiplier:1 constant:8],
|
||||
[NSLayoutConstraint constraintWithItem:contentView attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual toItem:statusContainerView attribute:NSLayoutAttributeTrailing multiplier:1 constant:20],
|
||||
|
||||
// statusTextField position
|
||||
[NSLayoutConstraint constraintWithItem:statusTextField attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:imageView attribute:NSLayoutAttributeTrailing multiplier:1 constant:8],
|
||||
[NSLayoutConstraint constraintWithItem:statusTextField attribute:NSLayoutAttributeFirstBaseline relatedBy:NSLayoutRelationEqual toItem:actionButton attribute:NSLayoutAttributeFirstBaseline multiplier:1 constant:0],
|
||||
|
||||
// actionButton position
|
||||
[NSLayoutConstraint constraintWithItem:actionButton attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:statusContainerView attribute:NSLayoutAttributeBottom multiplier:1 constant:8],
|
||||
[NSLayoutConstraint constraintWithItem:contentView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:actionButton attribute:NSLayoutAttributeBottom multiplier:1 constant:20],
|
||||
[NSLayoutConstraint constraintWithItem:actionButton attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationGreaterThanOrEqual toItem:statusTextField attribute:NSLayoutAttributeTrailing multiplier:1 constant:25],
|
||||
[NSLayoutConstraint constraintWithItem:contentView attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual toItem:actionButton attribute:NSLayoutAttributeTrailing multiplier:1 constant:20],
|
||||
[actionButton.widthAnchor constraintGreaterThanOrEqualToConstant:100],
|
||||
]];
|
||||
}
|
||||
|
||||
self = [super initWithWindow:window];
|
||||
if (self != nil)
|
||||
{
|
||||
_host = aHost;
|
||||
_centerPointValue = centerPointValue;
|
||||
_minimizable = minimizable;
|
||||
_closable = closable;
|
||||
_windowTitle = [windowTitle copy];
|
||||
_titleField = titleField;
|
||||
_actionButton = actionButton;
|
||||
_progressBar = progressBar;
|
||||
[self setShouldCascadeWindows:NO];
|
||||
|
||||
// Finish setting up bindings
|
||||
{
|
||||
NSRect windowFrame = window.frame;
|
||||
|
||||
if (centerPointValue != nil) {
|
||||
NSPoint centerPoint = centerPointValue.pointValue;
|
||||
[window setFrameOrigin:NSMakePoint(centerPoint.x - windowFrame.size.width / 2.0, centerPoint.y - windowFrame.size.height / 2.0)];
|
||||
} else {
|
||||
[window center];
|
||||
}
|
||||
|
||||
[titleField bind:NSValueBinding toObject:self withKeyPath:@"title" options:nil];
|
||||
[progressBar bind:NSMaxValueBinding toObject:self withKeyPath:@"maxProgressValue" options:nil];
|
||||
[progressBar bind:NSValueBinding toObject:self withKeyPath:@"progressValue" options:nil];
|
||||
[actionButton bind:NSTitleBinding toObject:self withKeyPath:@"buttonTitle" options:nil];
|
||||
[statusTextField bind:NSValueBinding toObject:self withKeyPath:@"statusText" options:nil];
|
||||
[statusTextField bind:NSHiddenBinding toObject:self withKeyPath:@"statusText" options:@{NSValueTransformerNameBindingOption: NSIsNilTransformerName}];
|
||||
}
|
||||
}
|
||||
return self;
|
||||
}
|
||||
@@ -67,39 +193,6 @@ static NSString *const SUStatusControllerTouchBarIdentifier = @"" SPARKLE_BUNDLE
|
||||
return [NSString stringWithFormat:@"%@ <%@>", [self class], _host.bundlePath];
|
||||
}
|
||||
|
||||
- (void)windowDidLoad
|
||||
{
|
||||
NSWindow *window = self.window;
|
||||
NSRect windowFrame = window.frame;
|
||||
|
||||
if (_centerPointValue != nil) {
|
||||
NSPoint centerPoint = _centerPointValue.pointValue;
|
||||
[window setFrameOrigin:NSMakePoint(centerPoint.x - windowFrame.size.width / 2.0, centerPoint.y - windowFrame.size.height / 2.0)];
|
||||
} else {
|
||||
[window center];
|
||||
}
|
||||
|
||||
if (_minimizable) {
|
||||
window.styleMask = (NSWindowStyleMask)(window.styleMask | NSWindowStyleMaskMiniaturizable);
|
||||
}
|
||||
if (_closable) {
|
||||
window.styleMask = (NSWindowStyleMask)(window.styleMask | NSWindowStyleMaskClosable);
|
||||
}
|
||||
[_progressBar setUsesThreadedAnimation:YES];
|
||||
[_statusTextField setFont:[NSFont monospacedDigitSystemFontOfSize:0 weight:NSFontWeightRegular]];
|
||||
|
||||
if (@available(macOS 16, *)) {
|
||||
_actionButton.controlSize = NSControlSizeLarge;
|
||||
}
|
||||
|
||||
window.title = _windowTitle;
|
||||
}
|
||||
|
||||
- (NSImage *)applicationIcon
|
||||
{
|
||||
return [SUApplicationInfo bestIconForHost:_host];
|
||||
}
|
||||
|
||||
- (void)beginActionWithTitle:(NSString *)aTitle maxProgressValue:(double)aMaxProgressValue statusText:(NSString *)aStatusText
|
||||
{
|
||||
self.title = aTitle;
|
||||
|
||||
Vendored
+26
-33
@@ -55,7 +55,7 @@
|
||||
// So even though macOS 12 supports TextKit 2 we do not use it there.
|
||||
// My development machines are currently on macOS 26 so I know TextKit 2 works well there.
|
||||
// macOS 13 - 15 requires more testing if we care to make the switch there.
|
||||
if (@available(macOS 16, *)) {
|
||||
if (@available(macOS 26, *)) {
|
||||
// Create NSTextView using TextKit 2
|
||||
// https://developer.apple.com/documentation/appkit/nstextview/1449347-initwithframe
|
||||
|
||||
@@ -363,45 +363,38 @@ static NSAttributedString *formatMarkdownAttributedString(NSAttributedString *or
|
||||
[_textView setContinuousSpellCheckingEnabled:NO];
|
||||
_textView.usesFontPanel = NO;
|
||||
_textView.editable = NO;
|
||||
|
||||
if (@available(macOS 10.14, *)) {
|
||||
_textView.usesAdaptiveColorMappingForDarkAppearance = YES;
|
||||
}
|
||||
_textView.usesAdaptiveColorMappingForDarkAppearance = YES;
|
||||
|
||||
[_scrollView setHasVerticalScroller:YES];
|
||||
[_scrollView setHasHorizontalScroller:NO];
|
||||
|
||||
if (_prefersMarkdown) {
|
||||
if (@available(macOS 12, *)) {
|
||||
dispatch_queue_attr_t queuePriority = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_USER_INITIATED, 0);
|
||||
dispatch_queue_attr_t queuePriority = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_USER_INITIATED, 0);
|
||||
|
||||
dispatch_queue_t markdownDispatchQueue = dispatch_queue_create("org.sparkle-project.markdown-loader", queuePriority);
|
||||
|
||||
dispatch_async(markdownDispatchQueue, ^{
|
||||
NSError *loadMarkdownError = nil;
|
||||
NSAttributedString *originalMarkdownAttributedString = [[NSAttributedString alloc] initWithMarkdownString:contents options:nil baseURL:baseURL error:&loadMarkdownError];
|
||||
|
||||
dispatch_queue_t markdownDispatchQueue = dispatch_queue_create("org.sparkle-project.markdown-loader", queuePriority);
|
||||
|
||||
dispatch_async(markdownDispatchQueue, ^{
|
||||
NSError *loadMarkdownError = nil;
|
||||
NSAttributedString *originalMarkdownAttributedString = [[NSAttributedString alloc] initWithMarkdownString:contents options:nil baseURL:baseURL error:&loadMarkdownError];
|
||||
if (originalMarkdownAttributedString == nil) {
|
||||
// Fallback to plain-text
|
||||
|
||||
if (originalMarkdownAttributedString == nil) {
|
||||
// Fallback to plain-text
|
||||
|
||||
NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:contents attributes:@{ NSFontAttributeName : [NSFont systemFontOfSize:(CGFloat)self->_fontPointSize] }];
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self _loadAttributedString:attributedString completionHandler:completionHandler];
|
||||
});
|
||||
} else {
|
||||
NSAttributedString *formattedAttributedString = formatMarkdownAttributedString(originalMarkdownAttributedString, (CGFloat)self->_fontPointSize);
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self _loadAttributedString:formattedAttributedString completionHandler:completionHandler];
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
return;
|
||||
} else {
|
||||
SULog(SULogLevelDefault, @"Warning: falling back to plain text because markdown support requires macOS 12 or newer");
|
||||
}
|
||||
NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:contents attributes:@{ NSFontAttributeName : [NSFont systemFontOfSize:(CGFloat)self->_fontPointSize] }];
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self _loadAttributedString:attributedString completionHandler:completionHandler];
|
||||
});
|
||||
} else {
|
||||
NSAttributedString *formattedAttributedString = formatMarkdownAttributedString(originalMarkdownAttributedString, (CGFloat)self->_fontPointSize);
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self _loadAttributedString:formattedAttributedString completionHandler:completionHandler];
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:contents attributes:@{ NSFontAttributeName : [NSFont systemFontOfSize:(CGFloat)_fontPointSize] }];
|
||||
|
||||
Vendored
+10
-20
@@ -299,14 +299,10 @@ typedef NS_ENUM(NSInteger, SUReleaseNotesFormat)
|
||||
usedReleaseNotesFormat = preferredReleaseNotesFormat;
|
||||
break;
|
||||
case SUReleaseNotesFormatHTML:
|
||||
if (@available(macOS 10.15, *)) {
|
||||
if ([[NSProcessInfo processInfo] isMacCatalystApp]) {
|
||||
usedReleaseNotesFormat = SUReleaseNotesFormatPlainText;
|
||||
|
||||
SULog(SULogLevelError, @"Error: Showing HTML release notes for Catalyst apps is not supported. The release notes will be interpreted as plain text. Please serve a plain-text (.txt) or markdown (.md) release notes file. If you are using a <description> element then please specify the %@=\"plain-text\" or %@=\"markdown\" attribute in that element.", SUAppcastAttributeFormat, SUAppcastAttributeFormat);
|
||||
} else {
|
||||
usedReleaseNotesFormat = preferredReleaseNotesFormat;
|
||||
}
|
||||
if ([[NSProcessInfo processInfo] isMacCatalystApp]) {
|
||||
usedReleaseNotesFormat = SUReleaseNotesFormatPlainText;
|
||||
|
||||
SULog(SULogLevelError, @"Error: Showing HTML release notes for Catalyst apps is not supported. The release notes will be interpreted as plain text. Please serve a plain-text (.txt) or markdown (.md) release notes file. If you are using a <description> element then please specify the %@=\"plain-text\" or %@=\"markdown\" attribute in that element.", SUAppcastAttributeFormat, SUAppcastAttributeFormat);
|
||||
} else {
|
||||
usedReleaseNotesFormat = preferredReleaseNotesFormat;
|
||||
}
|
||||
@@ -377,12 +373,10 @@ typedef NS_ENUM(NSInteger, SUReleaseNotesFormat)
|
||||
_releaseNotesView.view.frame = _releaseNotesContentView.bounds;
|
||||
_releaseNotesView.view.autoresizingMask = (NSAutoresizingMaskOptions)(NSViewWidthSizable | NSViewHeightSizable);
|
||||
|
||||
if (@available(macOS 10.14, *)) {
|
||||
// We need a transparent background
|
||||
// This avoids a "white flash" that may be present when the webview initially loads in dark mode
|
||||
// This also is necessary for macOS 10.14, otherwise the background may stay white on 10.14 (but not in later OS's)
|
||||
[_releaseNotesView setDrawsBackground:NO];
|
||||
}
|
||||
// We need a transparent background
|
||||
// This avoids a "white flash" that may be present when the webview initially loads in dark mode
|
||||
// This also is necessary for macOS 10.14, otherwise the background may stay white on 10.14 (but not in later OS's)
|
||||
[_releaseNotesView setDrawsBackground:NO];
|
||||
}
|
||||
|
||||
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *,id> *)change context:(void *)context
|
||||
@@ -413,11 +407,7 @@ typedef NS_ENUM(NSInteger, SUReleaseNotesFormat)
|
||||
|
||||
_releaseNotesBoxView.boxType = NSBoxCustom;
|
||||
_releaseNotesBoxView.cornerRadius = boxCornerRadius;
|
||||
if (@available(macOS 10.14, *)) {
|
||||
_releaseNotesBoxView.borderColor = NSColor.separatorColor;
|
||||
} else {
|
||||
_releaseNotesBoxView.borderColor = [NSColor colorWithCalibratedWhite:0.84 alpha:1.0];
|
||||
}
|
||||
_releaseNotesBoxView.borderColor = NSColor.separatorColor;
|
||||
_releaseNotesBoxView.borderWidth = boxBorderWidth;
|
||||
_releaseNotesBoxView.fillColor = NSColor.textBackgroundColor;
|
||||
|
||||
@@ -436,7 +426,7 @@ typedef NS_ENUM(NSInteger, SUReleaseNotesFormat)
|
||||
_installButton.title = SULocalizedStringFromTableInBundle(@"Install Update", SPARKLE_TABLE, sparkleBundle, @"");
|
||||
_automaticallyInstallUpdatesButton.title = SULocalizedStringFromTableInBundle(@"Automatically download and install updates in the future", SPARKLE_TABLE, sparkleBundle, @"");
|
||||
|
||||
if (@available(macOS 16, *)) {
|
||||
if (@available(macOS 26, *)) {
|
||||
_skipButton.controlSize = NSControlSizeLarge;
|
||||
_laterButton.controlSize = NSControlSizeLarge;
|
||||
_installButton.controlSize = NSControlSizeLarge;
|
||||
|
||||
Vendored
+1
-3
@@ -104,9 +104,7 @@
|
||||
}
|
||||
|
||||
if (underlyingErrors.count > 1) {
|
||||
if (@available(macOS 11.3, *)) {
|
||||
userInfo[NSMultipleUnderlyingErrorsKey] = [underlyingErrors copy];
|
||||
}
|
||||
userInfo[NSMultipleUnderlyingErrorsKey] = [underlyingErrors copy];
|
||||
}
|
||||
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:[userInfo copy]];
|
||||
|
||||
Vendored
+2
-2
@@ -31,7 +31,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "إلغاء";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "إلغاء التحديث";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -49,7 +49,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "حدث خطأ أثناء التحديث";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "تحديث %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+2
-2
@@ -37,7 +37,7 @@
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Reinicia el programa més tard";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Instal·lant l'actualització…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -52,7 +52,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Error d'actualització!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Actualitzant %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -79,7 +79,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Zrušit";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Zrušit aktualizaci";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
@@ -100,7 +100,7 @@
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Instalovat a ukončit";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Instaluje se aktualizace…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -130,7 +130,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "Aktualizace dokončena";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Aktualizuje se %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+111
-3
@@ -43,7 +43,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Annuller";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Annuller opdatering";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -58,7 +58,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Installer og genstart";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Installerer opdatering…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -76,7 +76,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Der opstod en fejl!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Opdaterer %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -117,3 +117,111 @@
|
||||
|
||||
/* Anonymous system profile information disclosure for update permission dialog */
|
||||
"Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:";
|
||||
|
||||
/* Description text for SUUpdateAlert when the critical update is downloadable. */
|
||||
"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@ er tilgængelig – du har %3$@. Dette er en vigtig opdatering. Vil du hente den nu?";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%@ is now updated to version %@!" = "%1$@ er nu opdateret til version %2$@!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%@ is now updated!" = "%@ er nu opdateret!";
|
||||
|
||||
/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
|
||||
"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ er hentet og klar til brug! Dette er en vigtig opdatering. Vil du installere den og genstarte %1$@ nu?";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@ er tilgængelig, men din version af macOS er for ny til denne opdatering. Opdateringen understøtter højst macOS %3$@.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@ er tilgængelig, men din version af macOS er for gammel til at installere den. Mindst macOS %3$@ er påkrævet.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "%1$@ kan ikke opdateres, når den køres fra den placering, den blev hentet til.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while connecting to the installer. Please try again later." = "Der opstod en fejl under oprettelse af forbindelse til installationsprogrammet. Prøv igen senere.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while launching the installer. Please try again later." = "Der opstod en fejl under åbning af installationsprogrammet. Prøv igen senere.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while running the updater. Please try again later." = "Der opstod en fejl under kørsel af opdateringsprogrammet. Prøv igen senere.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while starting the installer. Please try again later." = "Der opstod en fejl under start af installationsprogrammet. Prøv igen senere.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An important update to %@ is ready to install" = "En vigtig opdatering til %@ er klar til installering";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Application Name" = "Appnavn";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Application Version" = "Appversion";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU is 64-Bit?" = "CPU er 64-bit?";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU Speed (MHz)" = "CPU-hastighed (MHz)";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU Subtype" = "CPU-undertype";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU Type" = "CPU-type";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Failed to resume installing update." = "Installeringen af opdateringen kunne ikke genoptages.";
|
||||
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Installer ved afslutning";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Mac Model" = "Mac-model";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Memory (MB)" = "Hukommelse (MB)";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"No" = "Nej";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Number of CPUs" = "Antal CPU’er";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"OS Version" = "OS-version";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Preferred Language" = "Foretrukket sprog";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "Afslut %1$@, flyt den til mappen Apps, åbn det igen derfra og prøv igen.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The installation failed due to not having permission to write the new update." = "Installeringen mislykkedes, fordi der ikke var tilladelse til at skrive den nye opdatering.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "Opdateringen er ikke signeret korrekt og kunne ikke valideres. Prøv igen senere, eller kontakt appens udvikler.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Unable to Check For Updates" = "Kan ikke søge efter opdateringer";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "Opdatering installeret";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Version History" = "Versionshistorik";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Yes" = "Ja";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"You may need to allow modifications from %1$@ in System Settings under Privacy & Security and App Management to install future updates." = "Du skal muligvis give %1$@ tilladelse til at ændre apps i Systemindstillinger under Anonymitet og sikkerhed > Appadministration for at kunne installere fremtidige opdateringer.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Your macOS version is too new" = "Din version af macOS er for ny";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Your macOS version is too old" = "Din version af macOS er for gammel";
|
||||
Vendored
+3
-3
@@ -85,7 +85,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Abbrechen";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Aktualisierung abbrechen";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -118,7 +118,7 @@
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Installieren beim Beenden";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Update installieren …";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -169,7 +169,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "Update installiert";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Aktualisierung von %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -40,7 +40,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Ακύρωση";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Ακύρωση Ενημέρωσης";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -55,7 +55,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Εγκατάσταση και Επανεκκίνηση";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Εγκατάσταση ενημέρωσης…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -70,7 +70,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Σφάλμα Ενημέρωσης!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Ενημέρωση %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+6
-3
@@ -49,7 +49,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Cancelar";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Cancelar actualización";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -64,7 +64,10 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Instalar y volver a abrir";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Instalar al salir";
|
||||
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Instalando actualización…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -82,7 +85,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "¡Error de actualización!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Actualizando %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -52,7 +52,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "لغو";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "لغو بهروزرسانی";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -67,7 +67,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "نصب و بازکردن دوباره";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "در حال نصب بهروزرسانی";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -88,7 +88,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "خطای بهروزرسانی!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "%@ در حال بهروزرسانی";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -22,7 +22,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Kumoa";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Peruuta päivitykset";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -37,7 +37,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Asenna ja käynnistä ohjelma uudelleen";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Päivitys asennetaan…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -49,7 +49,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Virhe päivityksessä";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Päivitetään %@";
|
||||
|
||||
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
|
||||
|
||||
Vendored
+6
-3
@@ -52,7 +52,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Annuler";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Annuler la mise à jour";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -67,7 +67,10 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Installer et relancer";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Installer à la fermeture";
|
||||
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Installation de la mise à jour…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -88,7 +91,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Erreur pendant la mise à jour !";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Mise à jour de %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -79,7 +79,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "ביטול";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "בטל את העדכון";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -100,7 +100,7 @@
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "התקן בעת סגירת היישום";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "מתקין את העדכון";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -130,7 +130,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "העדכון הותקן בהצלחה";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "עדכון %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -49,7 +49,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Odustani";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Prekini aktualiziranje";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -64,7 +64,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Instaliraj i ponovo pokreni";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Instaliranje nadogradnje …";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -82,7 +82,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Greška prilikom aktualiziranja!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "%@ se aktualizira";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+2
-2
@@ -37,7 +37,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Mégsem";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Frissítés megszakítása";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -55,7 +55,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Frissítési hiba!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "%@ frissítése";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+2
-2
@@ -31,7 +31,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Setja upp og ræsa aftur";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Set inn uppfærslu…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -46,7 +46,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Villa við uppfærslu!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Uppfæri %@";
|
||||
|
||||
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
|
||||
|
||||
Vendored
+3
-3
@@ -79,7 +79,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Annulla";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Annulla Aggiornamento";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -100,7 +100,7 @@
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Installa all’uscita";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Installazione aggiornamento in corso…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -130,7 +130,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "Aggiornamento installato";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Aggiornamento di %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -85,7 +85,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "キャンセル";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "アップデートを中止";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -118,7 +118,7 @@
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "終了時にインストール";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "アップデートをインストールしています…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -169,7 +169,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "アップデートがインストールされました";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "%@をアップデート中";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -79,7 +79,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "취소";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "업데이트 취소";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -100,7 +100,7 @@
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "종료 시 설치";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "설치 중…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -130,7 +130,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "업데이트가 설치되었습니다.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "%@ 업데이트 중";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -46,7 +46,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Avbryt";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Avbryt oppdateringen";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -61,7 +61,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Installer og start på ny";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Installerer oppdateringen…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -79,7 +79,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Feil ved oppdateringen!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Oppdaterer %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -85,7 +85,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Annuleer";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Annuleer update";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -118,7 +118,7 @@
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Installeer bij het stoppen";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Update installeren…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -169,7 +169,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "Update geïnstalleerd";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "%@ bijwerken…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -46,7 +46,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Avbryt";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Avbryt oppdateringa";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -61,7 +61,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Installer og start på nytt";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Installerer oppdateringa…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -79,7 +79,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Feil ved oppdateringa!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Oppdaterer %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -43,7 +43,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Anuluj";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Anuluj uaktualnianie";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -58,7 +58,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Zainstaluj i uruchom ponownie";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Instalowanie uaktualnienia…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -73,7 +73,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Błąd uaktualniania!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Uaktualniam %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -76,7 +76,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Cancelar";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Cancelar Atualização";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -97,7 +97,7 @@
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Instalar ao Encerrar";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Instalando atualização…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -127,7 +127,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "Atualização Instalada";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Atualizando o app %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+28
-25
@@ -14,49 +14,52 @@
|
||||
"%@ of %@" = "%1$@ de %2$@";
|
||||
|
||||
/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
|
||||
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "O %1$@ %2$@ foi transferido e está pronto a instalar! Gostaria de o fazer agora e reiniciar o %1$@ posteriormente?";
|
||||
"%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$@?";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ can’t be updated because it was opened from a read-only or a temporary location." = "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.";
|
||||
"%1$@ can’t be updated because it was opened from a read-only or a temporary location." = "O %1$@ não pode ser atualizado porque foi aberto a partir de uma localização só de leitura ou temporária.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"A new version of %@ is available!" = "Uma nova versão do %@ está dísponível!";
|
||||
"A new version of %@ is available!" = "Uma nova versão do %@ está disponível!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"A new version of %@ is ready to install!" = "Uma nova versão do %@ está pronta a instalar!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"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 in retrieving update information. Please try again later." = "Ocorreu um erro ao recolher informação sobre as atualizações disponíveis. Por favor tente novamente mais tarde.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"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 downloading the update. Please try again later." = "Ocorreu um erro ao transferir a atualização. Por favor tente novamente mais tarde.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"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 extracting the archive. Please try again later." = "Ocorreu um erro ao extrair o arquivo. Por favor tente novamente mais tarde.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while parsing the update feed." = "Ocorrer um erro ao processar o feed de actualização.";
|
||||
"An error occurred while parsing the update feed." = "Ocorreu um erro ao processar o feed de atualização.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Cancelar";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel Update" = "Cancelar actualização";
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Cancelar atualização";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Checking for updates…" = "A procurar actualizações…";
|
||||
"Checking for updates…" = "A procurar atualizações…";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
"Downloading update…" = "A transferir actualização…";
|
||||
"Downloading update…" = "A transferir atualização…";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
"Extracting update…" = "A extrair actualização…";
|
||||
"Extracting update…" = "A extrair atualização…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Instalar e reiniciar";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
"Installing update…" = "A instalar actualização…";
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Instalar ao sair";
|
||||
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "A instalar atualização…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"OK" = "OK";
|
||||
@@ -65,22 +68,22 @@
|
||||
"Ready to Install" = "Pronto para instalar";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"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$@.";
|
||||
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Deverá o %1$@ procurar atualizações automaticamente? Pode sempre procurar atualizações manualmente a partir do menu do %1$@.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Erro na actualização!";
|
||||
"Update Error!" = "Erro na atualização!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Updating %@" = "A actualizar o %@";
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "A atualizar o %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Use o Finder para copiar o %1$@ para a sua pasta Aplicações, reinicie-o aí e tente novamente.";
|
||||
|
||||
/* 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!" = "Está actualizado!";
|
||||
"You’re up to date!" = "Está atualizado!";
|
||||
|
||||
/* Software Update title/label */
|
||||
"Software Update" = "Actualização de Software";
|
||||
"Software Update" = "Atualização de Software";
|
||||
|
||||
/* Remind Me Later choice for update alert */
|
||||
"Remind Me Later" = "Lembrar mais tarde";
|
||||
@@ -89,10 +92,10 @@
|
||||
"Skip This Version" = "Saltar esta versão";
|
||||
|
||||
/* Install Update choice for update alert */
|
||||
"Install Update" = "Instalar actualização";
|
||||
"Install Update" = "Instalar atualização";
|
||||
|
||||
/* Automatically download and install updates in the future option for update alert */
|
||||
"Automatically download and install updates in the future" = "No futuro, transferir e instalar actualizações automaticamente";
|
||||
"Automatically download and install updates in the future" = "No futuro, transferir e instalar atualizações automaticamente";
|
||||
|
||||
/* Check for updates automatically response for update permission dialog */
|
||||
"Check Automatically" = "Procurar automaticamente";
|
||||
@@ -101,13 +104,13 @@
|
||||
"Don’t Check" = "Não procurar";
|
||||
|
||||
/* Title question for update permission dialog */
|
||||
"Check for updates automatically?" = "Procurar actualizações automaticamente?";
|
||||
"Check for updates automatically?" = "Procurar atualizações automaticamente?";
|
||||
|
||||
/* Include anonymous system profile choice for update permission dialog */
|
||||
"Include anonymous system profile" = "Incluir perfil de sistema anónimo";
|
||||
|
||||
/* Automatically download and install updates choice for update permission dialog */
|
||||
"Automatically download and install updates" = "Transferir e instalar actualizações automaticamente";
|
||||
"Automatically download and install updates" = "Transferir e instalar atualizações automaticamente";
|
||||
|
||||
/* Anonymous system profile information disclosure for update permission dialog */
|
||||
"Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:" = "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.\n\nEsta é a informação que seria enviada:";
|
||||
"Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:" = "A informação anónima do perfil de sistema é usada para nos ajudar a planear o trabalho de desenvolvimento futuro. Por favor contacte-nos se tiver alguma questão acerca deste assunto.\n\nEsta é a informação que seria enviada:";
|
||||
Vendored
+3
-3
@@ -46,7 +46,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Anulează";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Anulează actualizarea";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -61,7 +61,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Instalează și Redeschide";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Instalează actualizarea…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -79,7 +79,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Eroare Actualizare!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Actualizează %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+6
-3
@@ -40,7 +40,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Отменить";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Отменить обновление";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -55,7 +55,10 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Установить и перезапустить";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Установить при выходе";
|
||||
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Устанавливаю обновление…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -73,7 +76,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Ошибка при обновлении!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Обновляю %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -40,7 +40,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Zrušiť";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Zrušiť aktualizáciu";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -55,7 +55,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Inštalovať a znovu spustiť";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Inštaluje sa aktualizácia…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -70,7 +70,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Chyba aktualizácie!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Aktualizuje sa %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -40,7 +40,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Prekliči";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Prekliči posodabljanje";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -55,7 +55,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Namesti in ponovno zaženi";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Nameščanje posodobitve …";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -70,7 +70,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Napaka pri posodabljanju";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Posodabljam %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -37,7 +37,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Avbryt";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Avbryt uppdatering";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -52,7 +52,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Installera och starta om";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Installerar uppdatering…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -70,7 +70,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Uppdateringsfel!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Uppdaterar %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -40,7 +40,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "ยกเลิก";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "ยกเลิกอัพเดท";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -55,7 +55,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "ติดตั้งและเริ่มแอปพลิเคชันใหม่";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "กำลังติดตั้งอัพเดท…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -73,7 +73,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "อัพเดทผิดพลาด!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "กำลังอัพเดท %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -43,7 +43,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Vazgeç";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Güncellemeden Vazgeç";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -58,7 +58,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Yükle ve Yeniden Başlat";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Güncelleme kuruluyor…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -73,7 +73,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Güncelleme Hatası!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "%@ güncelleniyor";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+6
-3
@@ -40,7 +40,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Відмінити";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Відмінити оновлення";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -55,7 +55,10 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Встановити та перезавантажити";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Встановити при виході";
|
||||
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Встановлюю оновлення…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -73,7 +76,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Помилка оновлення!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Оновлюю %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -88,7 +88,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Hủy";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "Hủy cập nhật";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -121,7 +121,7 @@
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "Cài đặt khi thoát";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "Đang cài đặt bản cập nhật…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -175,7 +175,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "Đã cài đặt cập nhật";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "Đang cập nhật %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+3
-3
@@ -85,7 +85,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "取消";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "取消更新";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -118,7 +118,7 @@
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "退出应用时安装";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "正在安装更新…";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -172,7 +172,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "更新已安装";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "正在更新%@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Vendored
+150
-86
@@ -1,125 +1,212 @@
|
||||
/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
|
||||
"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下載並可供使用!此爲重要更新,是否立即安裝並重新啓動 %1$@?";
|
||||
|
||||
/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
|
||||
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下載並可供使用!是否立即安裝並重新啓動 %1$@?";
|
||||
/* No comment provided by engineer. */
|
||||
"%@ %@ is currently the newest version available." = "%1$@ %2$@ 已為現時最新可用的版本。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@ 現已可供下載,但你嘅 macOS 版本過新以致無法安裝。此更新僅支援至 macOS %3$@。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@ 現已可供下載,但你嘅 macOS 版本過舊以致無法安裝。最低版本需求爲 macOS %3$@。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "如果從下載位置運行 %1$@,則無法進行更新。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ can’t be updated because it was opened from a read-only or a temporary location." = "無法更新 %1$@,因爲佢運行於一個只讀或臨時位置。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%@ %@ is currently the newest version available." = "%1$@ %2$@ 已係目前最新版本。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ 已係目前最新版本。\n(你正在運行版本係 %3$@。)";
|
||||
"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ 已為現時最新可用的版本。\n(你現時執行的版本是 %3$@。)";
|
||||
|
||||
/* Description text for SUUpdateAlert when the critical update is downloadable. */
|
||||
"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@ 現已可供下載,你目前版本係 %3$@。此爲重要更新,是否立即下載?";
|
||||
"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@ 現已可供下載,而你的版本是 %3$@。此為重要更新,是否立即下載?";
|
||||
|
||||
/* Description text for SUUpdateAlert when the update is downloadable. */
|
||||
"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ 現已可供下載,你目前版本係 %3$@。是否立即下載?";
|
||||
"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ 現已可供下載,而你的版本是 %3$@。是否立即下載?";
|
||||
|
||||
/* Description text for SUUpdateAlert when the update informational with no download. */
|
||||
"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ 現已可供下載,你目前版本係 %3$@。要毋要去網站度瞭解更多關於此更新嘅資訊?";
|
||||
"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ 現已可供下載,而你的版本是 %3$@。你要在網頁上進一步了解關於此更新的資料嗎?";
|
||||
|
||||
/* The download progress in a unit of bytes, e.g. 100 KB */
|
||||
"%@ downloaded" = "%@ 已下載";
|
||||
"%@ downloaded" = "已下載 %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%@ is now updated to version %@!" = "%1$@ 已更新至版本 %2$@!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%@ is now updated!" = "%@ 已完成更新!";
|
||||
"%@ is now updated!" = "%@ 已更新!";
|
||||
|
||||
/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
|
||||
"%@ of %@" = "%1$@ / %2$@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"A new version of %@ is available!" = "新版本 %@ 已可供下載!";
|
||||
/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
|
||||
"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下載並可供使用!此為重要更新,是否立即安裝並重新啟󠄁動 %1$@?";
|
||||
|
||||
/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
|
||||
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下載並可供使用!是否立即安裝並重新啟󠄁動 %1$@?";
|
||||
|
||||
/* Mac is too old and update requires Apple silicon Mac */
|
||||
"%1$@ %2$@ is available but this update requires a new Apple silicon Mac." = "%1$@ %2$@ 已可供下載,但此更新需要新的 Apple 晶片 Mac 才能使用。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"A new version of %@ is ready to install!" = "新版本 %@ 已可供安裝!";
|
||||
"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@ 已可供下載,但你的 macOS 版本太新,無法安裝。此更新只支援至 macOS %3$@。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred in retrieving update information. Please try again later." = "擷取更新資訊時發生錯誤。請稍後再試。";
|
||||
"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@ 已可供下載,但你的 macOS 版本太舊,無法安裝。最低需要 macOS %3$@。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while connecting to the installer. Please try again later." = "連線到安裝程式時發生錯誤。請稍後再試。";
|
||||
"%1$@ can’t be updated because it was opened from a read-only or a temporary location." = "無法更新 %1$@,因為此 App 已從唯讀或臨時的位置開啟󠄁。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "如從下載的位置執行 %1$@,則其無法更新。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"A new version of %@ is available!" = "新版本的 %@ 已可供下載!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"A new version of %@ is ready to install!" = "新版本的 %@ 已可供安裝!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred in retrieving update information. Please try again later." = "取得更新資料時發生錯誤。請稍後再試。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while connecting to the installer. Please try again later." = "連接安裝程式時發生錯誤。請稍後再試。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while downloading the release notes." = "下載版本備註時發生錯誤。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while downloading the update. Please try again later." = "下載更新時發生錯誤。請稍後再試。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while extracting the archive. Please try again later." = "解壓縮時發生錯誤。請稍後再試。";
|
||||
"An error occurred while extracting the archive. Please try again later." = "提取封存檔時發生錯誤。請稍後再試。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while launching the installer. Please try again later." = "啓動安裝程式時發生錯誤。請稍後再試。";
|
||||
"An error occurred while launching the installer. Please try again later." = "啟󠄁動安裝程式時發生錯誤。請稍後再試。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while parsing the update feed." = "剖析更新摘要時發生錯誤。";
|
||||
"An error occurred while parsing the update feed." = "剖析更新 Feed 時發生錯誤。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while running the updater. Please try again later." = "執行更新程式時發生錯誤。請稍後再試。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while starting the installer. Please try again later." = "啓動安裝程式時發生錯誤。請稍後再試。";
|
||||
"An error occurred while starting the installer. Please try again later." = "啟󠄁動安裝程式時發生錯誤。請稍後再試。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An important update to %@ is ready to install" = " %@ 重要更新已可供安裝";
|
||||
"An important update to %@ is ready to install" = "%@ 的重要更新已可供安裝";
|
||||
|
||||
/* Anonymous system profile information disclosure for update permission dialog */
|
||||
"Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:" = "匿名系統檔案資料將用於協助規劃我們未來的開發工作。如你對此有任何問題,請聯絡我們。\n\n以下資料將會被送出:";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Application Name" = "應用程式名稱";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Application Version" = "應用程式版本";
|
||||
|
||||
/* Automatically download and install updates choice for update permission dialog */
|
||||
"Automatically download and install updates" = "自動下載並安裝更新";
|
||||
|
||||
/* Automatically download and install updates in the future option for update alert */
|
||||
"Automatically download and install updates in the future" = "以後自動下載並安裝更新";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "取消";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "取消更新";
|
||||
|
||||
/* Check for updates automatically response for update permission dialog */
|
||||
"Check Automatically" = "自動檢查";
|
||||
|
||||
/* Title question for update permission dialog */
|
||||
"Check for updates automatically?" = "自動檢查更新?";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Checking for updates…" = "檢查緊更新⋯";
|
||||
"Checking for updates…" = "正在檢查更新⋯";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU is 64-Bit?" = "CPU 是 64 位?";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU Speed (MHz)" = "CPU 速度 (MHz)";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU Subtype" = "CPU 子類別";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"CPU Type" = "CPU 類型";
|
||||
|
||||
/* Don't check for updates automatically response for update permission dialog */
|
||||
"Don’t Check" = "不要檢查";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
"Downloading update…" = "下載緊更新⋯";
|
||||
"Downloading update…" = "正在下載更新⋯";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
"Extracting update…" = "解壓緊更新⋯";
|
||||
"Extracting update…" = "正在提取更新⋯";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Failed to resume installing update." = "嘗試繼續安裝更新失敗。";
|
||||
"Failed to resume installing update." = "嘗試繼續安裝更新時失敗。";
|
||||
|
||||
/* Include anonymous system profile choice for update permission dialog */
|
||||
"Include anonymous system profile" = "包括匿名系統檔案";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "安裝並重新啓動";
|
||||
"Install and Relaunch" = "安裝並重新啟󠄁動";
|
||||
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "結束時安裝";
|
||||
"Install on Quit" = "在結束時安裝";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
"Installing update…" = "安裝緊更新⋯";
|
||||
/* Install Update choice for update alert */
|
||||
"Install Update" = "安裝更新";
|
||||
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "正在安裝更新⋯";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
"Learn More…" = "瞭解更多⋯";
|
||||
"Learn More…" = "進一步了解⋯";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Mac Model" = "Mac 型號";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Memory (MB)" = "記憶體 (MB)";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"No" = "否";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Number of CPUs" = "CPU 數目";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"OK" = "好";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "請結束 %1$@ 並將其移至「應用程式」檔案夾,從該處重新啓動後再試。";
|
||||
"OS Version" = "OS 版本";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Preferred Language" = "偏好的語言";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "結束 %1$@ 並將其移動至「應用程式」資料夾,從此處重新啟󠄁動,然後再試。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Ready to Install" = "已可供安裝";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ 是否應自動檢查更新?你可隨時從 %1$@ 選單手動檢查更新。";
|
||||
/* Remind Me Later choice for update alert */
|
||||
"Remind Me Later" = "稍後提醒我";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "此更新並未正確簽署且無法驗證。請稍後再試或聯絡軟體開發者。";
|
||||
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ 是否應該自動檢查更新?你可以隨時從 %1$@ 選單手動檢查更新。";
|
||||
|
||||
/* Skip This Version choice for update alert */
|
||||
"Skip This Version" = "跳過此版本";
|
||||
|
||||
/* Software Update title/label */
|
||||
"Software Update" = "軟件更新";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The installation failed due to not having permission to write the new update." = "安裝失敗,因為未有寫入新更新的權限。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The release notes is improperly signed and could not be validated. Please contact the app developer for more information." = "版本備註未正確簽署,無法驗證。如需更多資料,請聯絡 App 開發者。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The update feed is improperly signed and could not be validated. Please try again later or contact the app developer." = "更新 Feed 未正確簽署,無法驗證。請稍後再試,或聯絡 App 開發者。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "更新未正確簽署,無法驗證。請稍後再試,或聯絡 App 開發者。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The updater failed to start. Please verify you have the latest version of %@ and contact the app developer if the issue still persists. Check the Console logs for more information." = "無法啟動更新程式。請核對你有最新版本的 %@,如問題持續,請聯絡 App 開發者。如需更多資料,請檢視控制台記錄。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Unable to Check For Updates" = "無法檢查更新";
|
||||
@@ -130,53 +217,30 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "已安裝更新";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Updating %@" = "更新緊 %@";
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "正在更新 %@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "請將 %1$@ 複製至「應用程式」檔案夾,從該處重新啓動後再試。";
|
||||
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "使用 Finder 將 %1$@ 複製至「應用程式」資料夾,在該處重新啟󠄁動,然後再試。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Version History" = "版本歷史";
|
||||
"Version History" = "版本記錄";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Your macOS version is too new" = "你 macOS 版本過新";
|
||||
"Yes" = "是";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Your macOS version is too old" = "你 macOS 版本過舊";
|
||||
"You may need to allow modifications from %1$@ in System Settings under Privacy & Security and App Management to install future updates." = "你可能需要允許 %1$@ 修改「系統設定」中的「私隱與保安」>「App 管理」設定,才能安裝未來的更新。";
|
||||
|
||||
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
|
||||
"You’re up to date!" = "你用緊最新版本!";
|
||||
"You’re up to date!" = "你的 App 是最新版本!";
|
||||
|
||||
/* Software Update title/label */
|
||||
"Software Update" = "軟體更新";
|
||||
/* Mac is too old and update requires newer hardware */
|
||||
"Your Mac is too old" = "你的 Mac 太舊";
|
||||
|
||||
/* Remind Me Later choice for update alert */
|
||||
"Remind Me Later" = "稍後提醒我";
|
||||
/* No comment provided by engineer. */
|
||||
"Your macOS version is too new" = "你的 macOS 版本太新";
|
||||
|
||||
/* Skip This Version choice for update alert */
|
||||
"Skip This Version" = "跳過此版本";
|
||||
/* No comment provided by engineer. */
|
||||
"Your macOS version is too old" = "你的 macOS 版本太舊";
|
||||
|
||||
/* Install Update choice for update alert */
|
||||
"Install Update" = "安裝更新";
|
||||
|
||||
/* Automatically download and install updates in the future option for update alert */
|
||||
"Automatically download and install updates in the future" = "以後自動下載並安裝更新";
|
||||
|
||||
/* Check for updates automatically response for update permission dialog */
|
||||
"Check Automatically" = "自動檢查";
|
||||
|
||||
/* Don't check for updates automatically response for update permission dialog */
|
||||
"Don’t Check" = "毋檢查";
|
||||
|
||||
/* Title question for update permission dialog */
|
||||
"Check for updates automatically?" = "自動檢查更新?";
|
||||
|
||||
/* Include anonymous system profile choice for update permission dialog */
|
||||
"Include anonymous system profile" = "包含匿名系統概況";
|
||||
|
||||
/* Automatically download and install updates choice for update permission dialog */
|
||||
"Automatically download and install updates" = "自動下載並安裝更新";
|
||||
|
||||
/* Anonymous system profile information disclosure for update permission dialog */
|
||||
"Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:" = "匿名系統概況資訊可用來協助我等計畫未來開發工作。若對此有任何疑問,請聯繫我等。\n\n以下係會傳送嘅資訊:";
|
||||
Vendored
+3
-3
@@ -85,7 +85,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "取消";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Cancel Update" = "取消更新";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
@@ -118,7 +118,7 @@
|
||||
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
|
||||
"Install on Quit" = "結束時安裝";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Installing update…" = "正在安裝更新項目⋯";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
@@ -172,7 +172,7 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Update Installed" = "已安裝更新";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
/* Run generate_progress_tool_localizations.py after updating. */
|
||||
"Updating %@" = "正在更新%@";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -5,7 +5,7 @@
|
||||
<item>
|
||||
<title>Version 3.0</title>
|
||||
<pubDate>Sat, 26 Jul 2014 15:20:12 +0000</pubDate>
|
||||
<sparkle:releaseNotesLink>https://sparkle-project.org/notes/relnote-3.0.txt</sparkle:releaseNotesLink>
|
||||
<sparkle:releaseNotesLink sparkle:length="1234">https://sparkle-project.org/notes/relnote-3.0.txt</sparkle:releaseNotesLink>
|
||||
<sparkle:fullReleaseNotesLink>https://sparkle-project.org/fullnotes.txt</sparkle:fullReleaseNotesLink>
|
||||
<link>https://sparkle-project.org</link>
|
||||
<enclosure url="https://sparkle-project.org/release-3.0.zip" sparkle:version="3.0" length="1346234" />
|
||||
@@ -13,8 +13,13 @@
|
||||
<item>
|
||||
<title>Version 2.0</title>
|
||||
<pubDate>Sat, 26 Jul 2014 15:20:12 +0000</pubDate>
|
||||
<sparkle:releaseNotesLink>http://sparkle-project.org/notes/relnote-2.0.txt</sparkle:releaseNotesLink>
|
||||
<sparkle:fullReleaseNotesLink>http://sparkle-project.org/fullnotes.txt</sparkle:fullReleaseNotesLink>
|
||||
<!-- Test that whitespace/newlines are trimmed too -->
|
||||
<sparkle:releaseNotesLink>
|
||||
http://sparkle-project.org/notes/relnote-2.0.txt
|
||||
</sparkle:releaseNotesLink>
|
||||
<sparkle:fullReleaseNotesLink>
|
||||
http://sparkle-project.org/fullnotes.txt
|
||||
</sparkle:fullReleaseNotesLink>
|
||||
<link>http://sparkle-project.org</link>
|
||||
<enclosure url="http://sparkle-project.org/release-2.0.zip" sparkle:version="2.0" length="1346234" />
|
||||
</item>
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
|
||||
<channel>
|
||||
<title>For unit test only</title>
|
||||
<item>
|
||||
<title>Version 2.0</title>
|
||||
<pubDate>Sat, 26 Jul 2014 15:20:12 +0000</pubDate>
|
||||
<sparkle:version>2.0</sparkle:version>
|
||||
<enclosure url="https://sparkle-project.org/release-2.0.pkg" sparkle:installationType="package" length="1346234" />
|
||||
</item>
|
||||
<item>
|
||||
<title>Version 1.0</title>
|
||||
<pubDate>Sat, 26 Jul 2014 15:20:12 +0000</pubDate>
|
||||
<sparkle:version>1.0</sparkle:version>
|
||||
<enclosure url="https://sparkle-project.org/release-1.0.zip" length="1346234" />
|
||||
</item>
|
||||
</channel>
|
||||
</rss>
|
||||
@@ -14,5 +14,22 @@
|
||||
<pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
|
||||
<enclosure url="http://localhost:1337/Sparkle_Test_App.zip" customNS:version="2.0" length="1346234" />
|
||||
</item>
|
||||
<item>
|
||||
<title>Version 4.0</title>
|
||||
<pubDate>Sat, 26 Jul 2014 15:20:13 +0000</pubDate>
|
||||
<customNS:informationalUpdate>
|
||||
<customNS:version>2.5</customNS:version>
|
||||
</customNS:informationalUpdate>
|
||||
<link>https://sparkle-project.org</link>
|
||||
<enclosure url="http://localhost:1337/Sparkle_Test_App.zip" customNS:version="4.0" length="1346234" />
|
||||
</item>
|
||||
<item>
|
||||
<title>Version 5.0</title>
|
||||
<pubDate>Sat, 26 Jul 2014 15:20:14 +0000</pubDate>
|
||||
<customNS:tags>
|
||||
<customNS:criticalUpdate/>
|
||||
</customNS:tags>
|
||||
<enclosure url="http://localhost:1337/Sparkle_Test_App.zip" customNS:version="5.0" length="1346234" />
|
||||
</item>
|
||||
</channel>
|
||||
</rss>
|
||||
@@ -1009,12 +1009,17 @@ class SUAppcastTest: XCTestCase {
|
||||
let appcast = try SUAppcast(xmlData: testData as Data, relativeTo: nil, stateResolver: stateResolver, signingValidationStatus: .skipped)
|
||||
let items = appcast.items
|
||||
|
||||
XCTAssertEqual(2, items.count)
|
||||
XCTAssertEqual(4, items.count)
|
||||
|
||||
XCTAssertEqual("Version 2.0", items[1].title)
|
||||
XCTAssertEqual("desc", items[1].itemDescription)
|
||||
XCTAssertNotNil(items[0].releaseNotesURL)
|
||||
XCTAssertEqual("https://sparkle-project.org/#works", items[0].releaseNotesURL!.absoluteString)
|
||||
|
||||
// Child elements of <sparkle:informationalUpdate> and <sparkle:tags> must be
|
||||
// resolved through the namespace URI too, not through their qualified name
|
||||
XCTAssertFalse(items[2].isInformationOnlyUpdate)
|
||||
XCTAssertTrue(items[3].isCriticalUpdate)
|
||||
} catch let err as NSError {
|
||||
NSLog("%@", err)
|
||||
XCTFail(err.localizedDescription)
|
||||
@@ -1037,12 +1042,14 @@ class SUAppcastTest: XCTestCase {
|
||||
|
||||
// Test https
|
||||
XCTAssertEqual("https://sparkle-project.org/notes/relnote-3.0.txt", items[0].releaseNotesURL?.absoluteString)
|
||||
XCTAssertEqual(1234, items[0].releaseNotesContentLength)
|
||||
XCTAssertEqual("https://sparkle-project.org/fullnotes.txt", items[0].fullReleaseNotesURL?.absoluteString)
|
||||
XCTAssertEqual("https://sparkle-project.org", items[0].infoURL?.absoluteString)
|
||||
XCTAssertEqual("https://sparkle-project.org/release-3.0.zip", items[0].fileURL?.absoluteString)
|
||||
|
||||
// Test http
|
||||
XCTAssertEqual("http://sparkle-project.org/notes/relnote-2.0.txt", items[1].releaseNotesURL?.absoluteString)
|
||||
XCTAssertEqual(0, items[1].releaseNotesContentLength)
|
||||
XCTAssertEqual("http://sparkle-project.org/fullnotes.txt", items[1].fullReleaseNotesURL?.absoluteString)
|
||||
XCTAssertEqual("http://sparkle-project.org", items[1].infoURL?.absoluteString)
|
||||
XCTAssertEqual("http://sparkle-project.org/release-2.0.zip", items[1].fileURL?.absoluteString)
|
||||
@@ -1163,4 +1170,42 @@ class SUAppcastTest: XCTestCase {
|
||||
XCTFail("Appcast creation should have passed when encountering dangerous link of one item")
|
||||
}
|
||||
}
|
||||
|
||||
func testPackageInstallAllowedWithSkippedSigningValidation() {
|
||||
let testFile = Bundle(for: SUAppcastTest.self).path(forResource: "test-package-update", ofType: "xml")!
|
||||
let testData = NSData(contentsOfFile: testFile)!
|
||||
|
||||
do {
|
||||
let stateResolver = SPUAppcastItemStateResolver(hostVersion: "1.0", applicationVersionComparator: SUStandardVersionComparator.default, standardVersionComparator: SUStandardVersionComparator.default)
|
||||
|
||||
let appcast = try SUAppcast(xmlData: testData as Data, relativeTo: nil, stateResolver: stateResolver, signingValidationStatus: .skipped)
|
||||
|
||||
XCTAssertEqual(appcast.items.count, 2)
|
||||
XCTAssertEqual(appcast.items[0].installationType, SPUInstallationTypeGuidedPackage)
|
||||
XCTAssertEqual(appcast.items[1].installationType, SPUInstallationTypeApplication)
|
||||
} catch let err as NSError {
|
||||
NSLog("Unexpected error: %@", err)
|
||||
XCTFail("Appcast creation should have passed when signing validation is skipped")
|
||||
}
|
||||
}
|
||||
|
||||
func testPackageInstallRejectedWithFailedSigningValidation() {
|
||||
let testFile = Bundle(for: SUAppcastTest.self).path(forResource: "test-package-update", ofType: "xml")!
|
||||
let testData = NSData(contentsOfFile: testFile)!
|
||||
|
||||
do {
|
||||
let stateResolver = SPUAppcastItemStateResolver(hostVersion: "1.0", applicationVersionComparator: SUStandardVersionComparator.default, standardVersionComparator: SUStandardVersionComparator.default)
|
||||
|
||||
let appcast = try SUAppcast(xmlData: testData as Data, relativeTo: nil, stateResolver: stateResolver, signingValidationStatus: .failed)
|
||||
|
||||
// The package-based item should be rejected because signing validation on the feed failed;
|
||||
// only the application-based item should remain
|
||||
XCTAssertEqual(appcast.items.count, 1)
|
||||
XCTAssertEqual(appcast.items[0].installationType, SPUInstallationTypeApplication)
|
||||
XCTAssertEqual(appcast.items[0].versionString, "1.0")
|
||||
} catch let err as NSError {
|
||||
NSLog("Unexpected error: %@", err)
|
||||
XCTFail("Appcast creation should have passed, dropping only the rejected package item")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -22,6 +22,22 @@ typedef void (^SUDeltaHandler)(NSFileManager *fileManager, NSString *sourceDirec
|
||||
|
||||
@implementation SUBinaryDeltaTest
|
||||
|
||||
static NSString *temporaryDirectory(NSString *base)
|
||||
{
|
||||
NSString *template = [NSTemporaryDirectory() stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.XXXXXXXXXX", base]];
|
||||
NSMutableData *data = [NSMutableData data];
|
||||
[data appendBytes:template.fileSystemRepresentation length:strlen(template.fileSystemRepresentation) + 1];
|
||||
|
||||
char *buffer = (char *)data.mutableBytes;
|
||||
char *templateResult = mkdtemp(buffer);
|
||||
if (templateResult == NULL) {
|
||||
perror("mkdtemp");
|
||||
return nil;
|
||||
}
|
||||
|
||||
return stringWithFileSystemRepresentation(templateResult);
|
||||
}
|
||||
|
||||
- (void)testTemporaryDirectory
|
||||
{
|
||||
NSString *tmp1 = temporaryDirectory(@"Sparklęエンジン");
|
||||
@@ -1377,7 +1393,7 @@ typedef void (^SUDeltaHandler)(NSFileManager *fileManager, NSString *sourceDirec
|
||||
NSTask *dittoTask = [[NSTask alloc] init];
|
||||
dittoTask.executableURL = [NSURL fileURLWithPath:@"/usr/bin/ditto" isDirectory:NO];
|
||||
|
||||
dittoTask.arguments = @[@"--hfsCompression", destinationFile, destinationFile2];
|
||||
dittoTask.arguments = @[@"--hfsCompression", @"--noclone", destinationFile, destinationFile2];
|
||||
|
||||
NSError *launchError = nil;
|
||||
BOOL launched = [dittoTask launchAndReturnError:&launchError];
|
||||
@@ -2345,4 +2361,32 @@ typedef void (^SUDeltaHandler)(NSFileManager *fileManager, NSString *sourceDirec
|
||||
XCTAssertTrue(success);
|
||||
}
|
||||
|
||||
- (void)testSpotlightImporterModificationDate
|
||||
{
|
||||
NSString *importerRelativePath = @"Contents/Library/Spotlight/Foo.mdimporter";
|
||||
|
||||
__block NSDate *modificationDateBeforePatch = nil;
|
||||
|
||||
BOOL success = [self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
|
||||
NSString *sourceImporterPath = [sourceDirectory stringByAppendingPathComponent:importerRelativePath];
|
||||
NSString *destinationImporterPath = [destinationDirectory stringByAppendingPathComponent:importerRelativePath];
|
||||
|
||||
XCTAssertTrue([fileManager createDirectoryAtPath:sourceImporterPath withIntermediateDirectories:YES attributes:nil error:nil]);
|
||||
XCTAssertTrue([fileManager createDirectoryAtPath:destinationImporterPath withIntermediateDirectories:YES attributes:nil error:nil]);
|
||||
|
||||
modificationDateBeforePatch = [fileManager attributesOfItemAtPath:sourceImporterPath error:nil][NSFileModificationDate];
|
||||
XCTAssertNotNil(modificationDateBeforePatch);
|
||||
|
||||
sleep(1); // wait for clock to advance
|
||||
} afterDiffHandler:nil afterPatchHandler:^(NSFileManager *fileManager, NSString * __unused sourceDirectory, NSString *destinationDirectory) {
|
||||
NSString *patchedImporterPath = [destinationDirectory stringByAppendingPathComponent:importerRelativePath];
|
||||
|
||||
NSDate *modificationDateAfterPatch = [fileManager attributesOfItemAtPath:patchedImporterPath error:nil][NSFileModificationDate];
|
||||
XCTAssertNotNil(modificationDateAfterPatch);
|
||||
|
||||
XCTAssertGreaterThan([modificationDateAfterPatch timeIntervalSinceDate:modificationDateBeforePatch], 0);
|
||||
}];
|
||||
XCTAssertTrue(success);
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -1,60 +0,0 @@
|
||||
//
|
||||
// SUSpotlightImporterTest.swift
|
||||
// Sparkle
|
||||
//
|
||||
// Created by Mayur Pawashe on 8/27/16.
|
||||
// Copyright © 2016 Sparkle Project. All rights reserved.
|
||||
//
|
||||
|
||||
import XCTest
|
||||
|
||||
class SUSpotlightImporterTest: XCTestCase
|
||||
{
|
||||
func testUpdatingSpotlightBundles()
|
||||
{
|
||||
let fileManager = SUFileManager()
|
||||
let tempDirectoryURL = try! fileManager.makeTemporaryDirectoryAppropriate(forDirectoryURL: URL(fileURLWithPath: NSHomeDirectory()))
|
||||
|
||||
let bundleDirectory = tempDirectoryURL.appendingPathComponent("bundle.app")
|
||||
try! fileManager.makeDirectory(at: bundleDirectory)
|
||||
|
||||
let innerDirectory = bundleDirectory.appendingPathComponent("foo")
|
||||
try! fileManager.makeDirectory(at: innerDirectory)
|
||||
try! Data().write(to: (bundleDirectory.appendingPathComponent("bar")), options: .atomicWrite)
|
||||
|
||||
let importerDirectory = innerDirectory.appendingPathComponent("baz.mdimporter")
|
||||
|
||||
try! fileManager.makeDirectory(at: importerDirectory)
|
||||
try! fileManager.makeDirectory(at: innerDirectory.appendingPathComponent("flag"))
|
||||
|
||||
try! Data().write(to: (importerDirectory.appendingPathComponent("file")), options: .atomicWrite)
|
||||
|
||||
let oldFooDirectoryAttributes = try! FileManager.default.attributesOfItem(atPath: innerDirectory.path)
|
||||
let oldBarFileAttributes = try! FileManager.default.attributesOfItem(atPath: bundleDirectory.appendingPathComponent("bar").path)
|
||||
let oldImporterAttributes = try! FileManager.default.attributesOfItem(atPath: importerDirectory.path)
|
||||
let oldFlagAttributes = try! FileManager.default.attributesOfItem(atPath: innerDirectory.appendingPathComponent("flag").path)
|
||||
let oldFileInImporterAttributes = try! FileManager.default.attributesOfItem(atPath: importerDirectory.appendingPathComponent("file").path)
|
||||
|
||||
sleep(1) // wait for clock to advance
|
||||
|
||||
// Update spotlight bundles
|
||||
SUBinaryDeltaUnarchiver.updateSpotlightImporters(atBundlePath: bundleDirectory.path)
|
||||
|
||||
let newFooDirectoryAttributes = try! FileManager.default.attributesOfItem(atPath: innerDirectory.path)
|
||||
XCTAssertEqual((newFooDirectoryAttributes[FileAttributeKey.modificationDate] as! Date).timeIntervalSince(oldFooDirectoryAttributes[FileAttributeKey.modificationDate] as! Date), 0)
|
||||
|
||||
let newBarFileAttributes = try! FileManager.default.attributesOfItem(atPath: bundleDirectory.appendingPathComponent("bar").path)
|
||||
XCTAssertEqual((newBarFileAttributes[FileAttributeKey.modificationDate] as! Date).timeIntervalSince(oldBarFileAttributes[FileAttributeKey.modificationDate] as! Date), 0)
|
||||
|
||||
let newImporterAttributes = try! FileManager.default.attributesOfItem(atPath: importerDirectory.path)
|
||||
XCTAssertGreaterThan((newImporterAttributes[FileAttributeKey.modificationDate] as! Date).timeIntervalSince(oldImporterAttributes[FileAttributeKey.modificationDate] as! Date), 0)
|
||||
|
||||
let newFlagAttributes = try! FileManager.default.attributesOfItem(atPath: innerDirectory.appendingPathComponent("flag").path)
|
||||
XCTAssertEqual((newFlagAttributes[FileAttributeKey.modificationDate] as! Date).timeIntervalSince(oldFlagAttributes[FileAttributeKey.modificationDate] as! Date), 0)
|
||||
|
||||
let newFileInImporterAttributes = try! FileManager.default.attributesOfItem(atPath: importerDirectory.appendingPathComponent("file").path)
|
||||
XCTAssertEqual((newFileInImporterAttributes[FileAttributeKey.modificationDate] as! Date).timeIntervalSince(oldFileInImporterAttributes[FileAttributeKey.modificationDate] as! Date), 0)
|
||||
|
||||
try! fileManager.removeItem(at: tempDirectoryURL)
|
||||
}
|
||||
}
|
||||
@@ -172,6 +172,16 @@ class SUUnarchiverTest: XCTestCase
|
||||
self.unarchiveTestAppWithExtension("dmg", resourceName: "SparkleTestCodeSign_pkg", expectingInstallationType: SPUInstallationTypeGuidedPackage)
|
||||
}
|
||||
|
||||
func testUnarchivingLicensedDMGWithNoText()
|
||||
{
|
||||
self.unarchiveTestAppWithExtension("license.no-text.dmg")
|
||||
}
|
||||
|
||||
func testUnarchivingLicensedDMGWithMultipleLanaguesAndLotsOfFormattedText()
|
||||
{
|
||||
self.unarchiveTestAppWithExtension("license.large-formatted-multi-lang-text.dmg")
|
||||
}
|
||||
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
func testUnarchivingBarePackage()
|
||||
{
|
||||
|
||||
@@ -146,13 +146,14 @@ class SUUpdateValidatorTest: XCTestCase {
|
||||
let signatures = self.signatures(signatureConfig)
|
||||
|
||||
let validator = SUUpdateValidator(downloadPath: self.signedTestFilePath, signatures: signatures, host: host, verifierInformation: nil)
|
||||
|
||||
let updateDirectory = try! FileManager.default.url(for: .itemReplacementDirectory, in: .userDomainMask, appropriateFor: URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true), create: true)
|
||||
|
||||
let updateDirectory = temporaryDirectory("SUUpdateValidatorTest")!
|
||||
defer { try! FileManager.default.removeItem(atPath: updateDirectory) }
|
||||
defer { try! FileManager.default.removeItem(at: updateDirectory) }
|
||||
let newBundle = self.bundle(newBundleConfig)
|
||||
try! FileManager.default.copyItem(at: newBundle.bundleURL, to: URL(fileURLWithPath: updateDirectory).appendingPathComponent(oldBundle.bundleURL.lastPathComponent))
|
||||
try! FileManager.default.copyItem(at: newBundle.bundleURL, to: updateDirectory.appendingPathComponent(oldBundle.bundleURL.lastPathComponent))
|
||||
|
||||
let result = (try? validator.validate(withUpdateDirectory: updateDirectory)) != nil
|
||||
let result = (try? validator.validate(withUpdateDirectory: updateDirectory.path)) != nil
|
||||
XCTAssertEqual(result, expectedResult, "oldBundle: \(oldBundleConfig), newBundle: \(newBundleConfig), signatures: \(signatureConfig)", line: line)
|
||||
}
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
#import "SUAppcast.h"
|
||||
#import "SUAppcast+Private.h"
|
||||
#import "SUAppcastItem.h"
|
||||
#import "SUAppcastItem+Private.h"
|
||||
#import "SUAppcastDriver.h"
|
||||
#import "SUVersionComparisonProtocol.h"
|
||||
#import "SUStandardVersionComparator.h"
|
||||
@@ -48,10 +49,4 @@ static const char *SUAppleQuarantineIdentifier = "com.apple.quarantine";
|
||||
|
||||
@end
|
||||
|
||||
@interface SUBinaryDeltaUnarchiver (Private)
|
||||
|
||||
+ (void)updateSpotlightImportersAtBundlePath:(NSString *)targetPath;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
Vendored
+13
-5
@@ -343,11 +343,19 @@ int bspatch(int argc,const char * const argv[])
|
||||
}
|
||||
epf = NULL;
|
||||
|
||||
/* Write the new file */
|
||||
f = fopen(argv[2], "w");
|
||||
if (f == NULL) {
|
||||
warn("failed to write new file: %s", argv[2]);
|
||||
goto cleanup;
|
||||
/* Write the new file without following symlinks at the destination path */
|
||||
{
|
||||
int newfd = open(argv[2], O_WRONLY | O_CREAT | O_TRUNC | O_NOFOLLOW, 0644);
|
||||
if (newfd < 0) {
|
||||
warn("failed to open new file: %s", argv[2]);
|
||||
goto cleanup;
|
||||
}
|
||||
f = fdopen(newfd, "w");
|
||||
if (f == NULL) {
|
||||
warn("failed to write new file: %s", argv[2]);
|
||||
close(newfd);
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
|
||||
if (fwrite(newp, 1, (size_t)newsize, f) < (size_t)newsize) {
|
||||
|
||||
+11
-17
@@ -62,24 +62,18 @@ enum DecodeSecretStringError : LocalizedError {
|
||||
|
||||
// Reads secret base64 string from a file
|
||||
func decodeSecretString(filePath: String) throws -> String {
|
||||
let privateKeyString: String
|
||||
if #available(macOS 10.15.4, *) {
|
||||
// Prefer to use FileHandle which supports process substitution:
|
||||
// https://github.com/sparkle-project/Sparkle/issues/2605
|
||||
let fileHandle = try FileHandle(forReadingFrom: URL(fileURLWithPath: filePath))
|
||||
|
||||
guard let data = try fileHandle.readToEnd() else {
|
||||
throw DecodeSecretStringError.unableToReadData
|
||||
}
|
||||
|
||||
guard let decodedPrivateKeyString = String(data: data, encoding: .utf8) else {
|
||||
throw DecodeSecretStringError.unableToDecodeDataAsUTF8String
|
||||
}
|
||||
|
||||
privateKeyString = decodedPrivateKeyString
|
||||
} else {
|
||||
privateKeyString = try String(contentsOf: URL(fileURLWithPath: filePath))
|
||||
// Use FileHandle because it supports process substitution:
|
||||
// https://github.com/sparkle-project/Sparkle/issues/2605
|
||||
let fileHandle = try FileHandle(forReadingFrom: URL(fileURLWithPath: filePath))
|
||||
|
||||
guard let data = try fileHandle.readToEnd() else {
|
||||
throw DecodeSecretStringError.unableToReadData
|
||||
}
|
||||
|
||||
guard let decodedPrivateKeyString = String(data: data, encoding: .utf8) else {
|
||||
throw DecodeSecretStringError.unableToDecodeDataAsUTF8String
|
||||
}
|
||||
|
||||
let privateKeyString = decodedPrivateKeyString
|
||||
return privateKeyString.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
}
|
||||
@@ -89,7 +89,6 @@ class ArchiveItem: CustomStringConvertible {
|
||||
var releaseNotesURLPrefix: URL?
|
||||
var signingError: Error?
|
||||
|
||||
@available(macOS 10.15.4, *)
|
||||
private static func binaryContainsPreARMSlice(_ fileURL: URL) -> Bool? {
|
||||
guard let fileHandle = try? FileHandle(forReadingFrom: fileURL) else {
|
||||
return nil
|
||||
@@ -180,7 +179,7 @@ class ArchiveItem: CustomStringConvertible {
|
||||
self._shortVersion = shortVersion
|
||||
self.feedURL = feedURL
|
||||
self.requiresSignedAppcast = requiresSignedAppcast
|
||||
self.minimumSystemVersion = minimumSystemVersion ?? "10.13"
|
||||
self.minimumSystemVersion = minimumSystemVersion ?? "12.0"
|
||||
self.hardwareRequirements = hardwareRequirements
|
||||
self.frameworkVersion = frameworkVersion
|
||||
self.sparkleExecutableFileSize = sparkleExecutableFileSize
|
||||
@@ -199,21 +198,12 @@ class ArchiveItem: CustomStringConvertible {
|
||||
}
|
||||
|
||||
convenience init(fromArchive archivePath: URL, unarchivedDir: URL, validateBundle: Bool, disableNestedCodeCheck: Bool) throws {
|
||||
let resourceKeys: [URLResourceKey]
|
||||
if #available(macOS 11, *) {
|
||||
resourceKeys = [.contentTypeKey]
|
||||
} else {
|
||||
resourceKeys = [.typeIdentifierKey]
|
||||
}
|
||||
let resourceKeys: [URLResourceKey] = [.contentTypeKey]
|
||||
let items = try FileManager.default.contentsOfDirectory(at: unarchivedDir, includingPropertiesForKeys: resourceKeys, options: .skipsHiddenFiles)
|
||||
|
||||
let bundles = items.filter({
|
||||
if let resourceValues = try? $0.resourceValues(forKeys: Set(resourceKeys)) {
|
||||
if #available(macOS 11, *) {
|
||||
return resourceValues.contentType!.conforms(to: .bundle)
|
||||
} else {
|
||||
return UTTypeConformsTo(resourceValues.typeIdentifier! as CFString, kUTTypeBundle)
|
||||
}
|
||||
return resourceValues.contentType!.conforms(to: .bundle)
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
@@ -273,12 +263,10 @@ class ArchiveItem: CustomStringConvertible {
|
||||
|
||||
var hardwareRequirements: String? = nil
|
||||
if mayNeedHardwareRequirement {
|
||||
if #available(macOS 10.15.4, *) {
|
||||
if let executableName = infoPlist[kCFBundleExecutableKey as String] as? String {
|
||||
let executablePath = appPath.appendingPathComponent("Contents/MacOS/\(executableName)")
|
||||
if let containsPreARMSlice = Self.binaryContainsPreARMSlice(executablePath), !containsPreARMSlice {
|
||||
hardwareRequirements = SUAppcastElementHardwareRequirementARM64
|
||||
}
|
||||
if let executableName = infoPlist[kCFBundleExecutableKey as String] as? String {
|
||||
let executablePath = appPath.appendingPathComponent("Contents/MacOS/\(executableName)")
|
||||
if let containsPreARMSlice = Self.binaryContainsPreARMSlice(executablePath), !containsPreARMSlice {
|
||||
hardwareRequirements = SUAppcastElementHardwareRequirementARM64
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -346,14 +334,15 @@ class ArchiveItem: CustomStringConvertible {
|
||||
guard filename.hasSuffix(localeExtension) else {
|
||||
continue
|
||||
}
|
||||
|
||||
|
||||
let locale = String(filename.dropLast(localeExtensionCount))
|
||||
|
||||
// English and Base directories are the least likely to be stripped,
|
||||
// so let's not bother recording them.
|
||||
guard filename != "en" && filename != "Base" else {
|
||||
guard locale != "en" && locale != "Base" else {
|
||||
continue
|
||||
}
|
||||
|
||||
let locale = String(filename.dropLast(localeExtensionCount))
|
||||
|
||||
localesPresent.append(locale)
|
||||
localeIndex += 1
|
||||
|
||||
|
||||
@@ -519,6 +519,9 @@ func writeAppcast(appcastDestPath: URL, keys: PrivateKeys, disableEmbeddedSignWa
|
||||
descElement.setChildren([cdata])
|
||||
if descriptionFormat != "html" {
|
||||
descElement.addAttribute(XMLNode.attribute(withName: SUAppcastAttributeFormat, stringValue: descriptionFormat) as! XMLNode)
|
||||
} else {
|
||||
// html is the default format, so drop a format left over from previously embedded release notes
|
||||
descElement.removeAttribute(forName: SUAppcastAttributeFormat)
|
||||
}
|
||||
} else if let existingDescriptionElement = findElement(name: "description", parent: item) {
|
||||
// The update doesn't include embedded release notes. Remove it.
|
||||
|
||||
Reference in new issue
Block a user