Compare commits

...
16 Commits
Author SHA1 Message Date
Antonin Hildebrand 06f4a5e52c fix a warning in string formatting
was getting 'Using %s directive in NSString which is being passed as a formatting argument to the formatting method'
2017-03-13 23:57:10 +01:00
Antonin Hildebrand 1f6113eae4 Merge tag 'tags/1.17.0' 2017-03-13 23:49:22 +01:00
Antonin Hildebrand d4b498c94d duplicate Release configuration as ReleaseLogging 2017-01-04 23:54:37 +01:00
Antonin Hildebrand f765ea6c72 LastUpgradeCheck = 0820 2017-01-03 22:57:37 +01:00
Antonin Hildebrand 6c05c09161 add .idea/ to git ignores 2016-12-19 23:17:22 +01:00
Antonin Hildebrand 262fac60ad merge upstream up to 8d0effe327 2016-12-19 23:16:03 +01:00
Antonin Hildebrand 9f53310253 LastUpgradeCheck = 0820 2016-12-19 20:08:20 +01:00
Antonin Hildebrand a819fbbfa9 fix compilation warnings under xcode 8 2016-06-16 19:00:35 +02:00
Antonin Hildebrand 08f55bce01 LastUpgradeCheck = 0800 2016-06-16 18:37:53 +02:00
Antonin Hildebrand 51f26f4ae1 remove includeInIndex = 1 from project.pbxproj
badev regen_xcconfigs fails on it for some reason
2016-04-15 21:31:44 +02:00
Antonin Hildebrand 58d568727b delete schemes we don't use 2016-04-14 22:16:50 +02:00
Antonin Hildebrand 6c56b0a9f0 comment out "Serving updates over HTTP may be blocked in OS X 10.11" warning 2016-02-08 17:48:52 +01:00
Antonin Hildebrand ae1c516afb -Wno-dollar-in-identifier-extension 2016-02-08 00:06:38 +01:00
Antonin Hildebrand 1de486956a rename Autoupdate.app to Update.app 2016-02-06 23:57:29 +01:00
Antonin Hildebrand ad78f264fa LastUpgradeCheck = 0730 2016-02-06 23:49:40 +01:00
Antonin Hildebrand 9ed93dd592 reapply relevant changes from old-fork 2016-02-06 23:45:00 +01:00
11 changed files with 120 additions and 227 deletions

No files matched your search

+2
View File
@@ -41,3 +41,5 @@ Carthage/Build
Network Trash Folder
Temporary Items
.apdisk
.idea/
+4 -4
View File
@@ -1,7 +1,7 @@
// Common
SPARKLE_BUNDLE_IDENTIFIER = org.sparkle-project.Sparkle
SPARKLE_RELAUNCH_TOOL_NAME = Autoupdate
SPARKLE_BUNDLE_IDENTIFIER = com.binaryage.sparkle
SPARKLE_RELAUNCH_TOOL_NAME = Updater
SPARKLE_FILEOP_TOOL_NAME = fileop
SPARKLE_APPEND_VERSION_NUMBER = 1
@@ -26,7 +26,7 @@ ENABLE_STRICT_OBJC_MSGSEND = YES
GCC_SYMBOLS_PRIVATE_EXTERN = YES
GCC_INLINES_ARE_PRIVATE_EXTERN = YES
ARCHS = $(ARCHS_STANDARD)
MACOSX_DEPLOYMENT_TARGET = 10.7
MACOSX_DEPLOYMENT_TARGET = 10.9
PRODUCT_NAME = ${TARGET_NAME}
PRODUCT_BUNDLE_IDENTIFIER = org.sparkle-project.Sparkle.${PRODUCT_NAME:rfc1034identifier}
@@ -88,4 +88,4 @@ CLANG_ENABLE_MODULES[sdk=macosx10.8] = NO
WARNING_CFLAGS_EXTRA = -Wno-custom-atomic-properties -Wno-implicit-atomic-properties
// Turn on all warnings, then disable a few which are almost impossible to avoid
WARNING_CFLAGS = -Wall -Weverything -Wno-unused-macros -Wno-gnu-statement-expression -Wno-arc-repeated-use-of-weak -Wno-auto-import $(WARNING_CFLAGS_EXTRA)
WARNING_CFLAGS = -Wall -Weverything -Wno-unused-macros -Wno-gnu-statement-expression -Wno-arc-repeated-use-of-weak -Wno-auto-import -Wno-partial-availability -Wno-dollar-in-identifier-extension $(WARNING_CFLAGS_EXTRA)
+92 -6
View File
@@ -29,7 +29,7 @@
1420DF50196247F900203BB0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1420DF4F196247F900203BB0 /* Images.xcassets */; };
142E0E0019A6954400E4312B /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
142E0E0219A6A14700E4312B /* Sparkle.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
142E0E0419A6A26F00E4312B /* Autoupdate.app in CopyFiles */ = {isa = PBXBuildFile; fileRef = 55C14BB7136EEF1500649790 /* Autoupdate.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
142E0E0419A6A26F00E4312B /* Updater.app in CopyFiles */ = {isa = PBXBuildFile; fileRef = 55C14BB7136EEF1500649790 /* Updater.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
142E0E0919A83AAC00E4312B /* SUBinaryDeltaTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */; };
14652F7C19A9725300959E44 /* SUBinaryDeltaCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D06E8E20FD68CC7005AE3F6 /* SUBinaryDeltaCommon.m */; };
14652F7D19A9726700959E44 /* SUBinaryDeltaApply.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D06E8E00FD68CC7005AE3F6 /* SUBinaryDeltaApply.m */; };
@@ -412,7 +412,7 @@
dstPath = "";
dstSubfolderSpec = 12;
files = (
142E0E0419A6A26F00E4312B /* Autoupdate.app in CopyFiles */,
142E0E0419A6A26F00E4312B /* Updater.app in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -530,7 +530,7 @@
555CF29B196C523E0000B31E /* el */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = el; path = el.lproj/SUAutomaticUpdateAlert.xib; sourceTree = "<group>"; };
555CF29C196C52460000B31E /* el */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = el; path = el.lproj/SUUpdateAlert.xib; sourceTree = "<group>"; };
555CF29D196C524C0000B31E /* el */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = el; path = el.lproj/SUUpdatePermissionPrompt.xib; sourceTree = "<group>"; };
55C14BB7136EEF1500649790 /* Autoupdate.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Autoupdate.app; sourceTree = BUILT_PRODUCTS_DIR; };
55C14BB7136EEF1500649790 /* Updater.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Updater.app; sourceTree = BUILT_PRODUCTS_DIR; };
55C14BB9136EEF1500649790 /* Autoupdate-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Autoupdate-Info.plist"; sourceTree = "<group>"; };
55C14BD3136EEFCE00649790 /* Autoupdate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Autoupdate.m; sourceTree = "<group>"; };
55C14BD8136EF00C00649790 /* SUStatus.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SUStatus.xib; sourceTree = "<group>"; };
@@ -924,7 +924,7 @@
5D06E8D00FD68C7C005AE3F6 /* BinaryDelta */,
722954B41D04ADAF00ECF9CA /* fileop */,
5AE13FB31E0D9E07000D2C2C /* generate_appcast */,
55C14BB7136EEF1500649790 /* Autoupdate.app */,
55C14BB7136EEF1500649790 /* Updater.app */,
61B5F90209C4CEE200B25A18 /* Sparkle Test App.app */,
612279D90DB5470200AB99EA /* Sparkle Unit Tests.xctest */,
8DC2EF5B0486A6940098B216 /* Sparkle.framework */,
@@ -1235,7 +1235,6 @@
72316BE11E0E1C7F0039EFD9 /* SUSystemUpdateInfo.h */,
72316BE21E0E1C7F0039EFD9 /* SUSystemUpdateInfo.m */,
);
includeInIndex = 1;
name = "Other Sources";
sourceTree = "<group>";
};
@@ -1487,7 +1486,7 @@
);
name = Autoupdate;
productName = Autoupdate;
productReference = 55C14BB7136EEF1500649790 /* Autoupdate.app */;
productReference = 55C14BB7136EEF1500649790 /* Updater.app */;
productType = "com.apple.product-type.application";
};
5AA96C541E0AE0DB00CA4346 /* generate_appcast */ = {
@@ -2574,6 +2573,82 @@
};
name = Release;
};
D6233BC41E1DB4910088E907 /* ReleaseLogging */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = FA1941CC0D94A70100DD942E /* ConfigCommonRelease.xcconfig */;
buildSettings = {
};
name = ReleaseLogging;
};
D6233BC51E1DB4910088E907 /* ReleaseLogging */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = FA1941D50D94A70100DD942E /* ConfigFrameworkRelease.xcconfig */;
buildSettings = {
};
name = ReleaseLogging;
};
D6233BC61E1DB4910088E907 /* ReleaseLogging */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = FA1941D20D94A70100DD942E /* ConfigTestAppRelease.xcconfig */;
buildSettings = {
};
name = ReleaseLogging;
};
D6233BC71E1DB4910088E907 /* ReleaseLogging */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = FA3AAF391050B273004B3130 /* ConfigUnitTestRelease.xcconfig */;
buildSettings = {
};
name = ReleaseLogging;
};
D6233BC81E1DB4910088E907 /* ReleaseLogging */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 5D06E8F30FD68D21005AE3F6 /* ConfigBinaryDeltaRelease.xcconfig */;
buildSettings = {
};
name = ReleaseLogging;
};
D6233BC91E1DB4910088E907 /* ReleaseLogging */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = FA1941D40D94A70100DD942E /* ConfigRelaunchRelease.xcconfig */;
buildSettings = {
};
name = ReleaseLogging;
};
D6233BCA1E1DB4910088E907 /* ReleaseLogging */ = {
isa = XCBuildConfiguration;
buildSettings = {
};
name = ReleaseLogging;
};
D6233BCB1E1DB4910088E907 /* ReleaseLogging */ = {
isa = XCBuildConfiguration;
buildSettings = {
};
name = ReleaseLogging;
};
D6233BCC1E1DB4910088E907 /* ReleaseLogging */ = {
isa = XCBuildConfiguration;
buildSettings = {
};
name = ReleaseLogging;
};
D6233BCD1E1DB4910088E907 /* ReleaseLogging */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 729F11001C65A9B500DFCCC5 /* ConfigUITestRelease.xcconfig */;
buildSettings = {
};
name = ReleaseLogging;
};
D6233BCE1E1DB4910088E907 /* ReleaseLogging */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 722954C81D04E89500ECF9CA /* ConfigFileop.xcconfig */;
buildSettings = {
GCC_WARN_UNUSED_VARIABLE = YES;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = ReleaseLogging;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -2583,6 +2658,7 @@
1420DF4B1962329200203BB0 /* Debug */,
149B78611B7D398100D7D62C /* Coverage */,
1420DF4C1962329200203BB0 /* Release */,
D6233BCB1E1DB4910088E907 /* ReleaseLogging */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -2593,6 +2669,7 @@
14732BC71960F69300593899 /* Debug */,
149B78601B7D398100D7D62C /* Coverage */,
14732BC81960F69300593899 /* Release */,
D6233BCA1E1DB4910088E907 /* ReleaseLogging */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -2603,6 +2680,7 @@
14950061195FB89500BC5B5B /* Debug */,
149B78621B7D398100D7D62C /* Coverage */,
14950062195FB89500BC5B5B /* Release */,
D6233BCC1E1DB4910088E907 /* ReleaseLogging */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -2613,6 +2691,7 @@
1DEB91AE08733DA50010E9CD /* Debug */,
149B785B1B7D398100D7D62C /* Coverage */,
1DEB91AF08733DA50010E9CD /* Release */,
D6233BC51E1DB4910088E907 /* ReleaseLogging */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -2623,6 +2702,7 @@
1DEB91B208733DA50010E9CD /* Debug */,
149B785A1B7D398100D7D62C /* Coverage */,
1DEB91B308733DA50010E9CD /* Release */,
D6233BC41E1DB4910088E907 /* ReleaseLogging */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -2633,6 +2713,7 @@
55C14BBB136EEF1500649790 /* Debug */,
149B785F1B7D398100D7D62C /* Coverage */,
55C14BBC136EEF1500649790 /* Release */,
D6233BC91E1DB4910088E907 /* ReleaseLogging */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -2653,6 +2734,7 @@
5D06E8D20FD68C7D005AE3F6 /* Debug */,
149B785E1B7D398100D7D62C /* Coverage */,
5D06E8D30FD68C7D005AE3F6 /* Release */,
D6233BC81E1DB4910088E907 /* ReleaseLogging */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -2663,6 +2745,7 @@
612279DB0DB5470300AB99EA /* Debug */,
149B785D1B7D398100D7D62C /* Coverage */,
612279DC0DB5470300AB99EA /* Release */,
D6233BC71E1DB4910088E907 /* ReleaseLogging */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -2673,6 +2756,7 @@
61B5F90609C4CEE300B25A18 /* Debug */,
149B785C1B7D398100D7D62C /* Coverage */,
61B5F90709C4CEE300B25A18 /* Release */,
D6233BC61E1DB4910088E907 /* ReleaseLogging */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -2683,6 +2767,7 @@
722954B81D04ADAF00ECF9CA /* Debug */,
722954B91D04ADAF00ECF9CA /* Coverage */,
722954BA1D04ADAF00ECF9CA /* Release */,
D6233BCE1E1DB4910088E907 /* ReleaseLogging */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -2693,6 +2778,7 @@
726B2B641C645FC900388755 /* Debug */,
726B2B651C645FC900388755 /* Coverage */,
726B2B661C645FC900388755 /* Release */,
D6233BCD1E1DB4910088E907 /* ReleaseLogging */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -1,99 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "14732BC51960F69300593899"
BuildableName = "Distribution"
BlueprintName = "Distribution"
ReferencedContainer = "container:Sparkle.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "612279D80DB5470200AB99EA"
BuildableName = "Sparkle Unit Tests.xctest"
BlueprintName = "Sparkle Unit Tests"
ReferencedContainer = "container:Sparkle.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "14732BC51960F69300593899"
BuildableName = "Distribution"
BlueprintName = "Distribution"
ReferencedContainer = "container:Sparkle.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "14732BC51960F69300593899"
BuildableName = "Distribution"
BlueprintName = "Distribution"
ReferencedContainer = "container:Sparkle.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "14732BC51960F69300593899"
BuildableName = "Distribution"
BlueprintName = "Distribution"
ReferencedContainer = "container:Sparkle.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
@@ -1,100 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
BuildableName = "Sparkle.framework"
BlueprintName = "Sparkle"
ReferencedContainer = "container:Sparkle.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "612279D80DB5470200AB99EA"
BuildableName = "Sparkle Unit Tests.xctest"
BlueprintName = "Sparkle Unit Tests"
ReferencedContainer = "container:Sparkle.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
BuildableName = "Sparkle.framework"
BlueprintName = "Sparkle"
ReferencedContainer = "container:Sparkle.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugXPCServices = "NO"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
BuildableName = "Sparkle.framework"
BlueprintName = "Sparkle"
ReferencedContainer = "container:Sparkle.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
BuildableName = "Sparkle.framework"
BlueprintName = "Sparkle"
ReferencedContainer = "container:Sparkle.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
+4
View File
@@ -414,6 +414,10 @@
- (void)installWithToolAndRelaunch:(BOOL)relaunch
{
// TotalFinder-related HACK to prevent relaunch, installer does relaunch automatically
// same applies for TotalTerminal and Asepsis
relaunch = NO;
// Perhaps a poor assumption but: if we're not relaunching, we assume we shouldn't be showing any UI either. Because non-relaunching installations are kicked off without any user interaction, we shouldn't be interrupting them.
[self installWithToolAndRelaunch:relaunch displayingUserInterface:relaunch];
}
+13 -13
View File
@@ -58,7 +58,7 @@
{
@autoreleasepool {
BOOL mountedSuccessfully = NO;
// get a unique mount point path
NSString *mountPoint = nil;
NSFileManager *manager;
@@ -81,12 +81,12 @@
}
// Note: this check does not follow symbolic links, which is what we want
while ([[NSURL fileURLWithPath:mountPoint] checkResourceIsReachableAndReturnError:NULL]);
NSData *promptData = nil;
promptData = [NSData dataWithBytes:"yes\n" length:4];
NSMutableArray *arguments = [@[@"attach", self.archivePath, @"-mountpoint", mountPoint, /*@"-noverify",*/ @"-nobrowse", @"-noautoopen"] mutableCopy];
if (self.decryptionPassword) {
NSMutableData *passwordData = [[self.decryptionPassword dataUsingEncoding:NSUTF8StringEncoding] mutableCopy];
// From the hdiutil docs:
@@ -96,10 +96,10 @@
[passwordData appendData:[NSData dataWithBytes:"\0" length:1]];
[passwordData appendData:promptData];
promptData = passwordData;
[arguments addObject:@"-stdinpass"];
}
NSData *output = nil;
NSInteger taskResult = -1;
@try
@@ -132,7 +132,7 @@
{
goto reportError;
}
[notifier notifyProgress:0.5];
if (taskResult != 0)
@@ -142,7 +142,7 @@
goto reportError;
}
mountedSuccessfully = YES;
// Now that we've mounted it, we need to copy out its contents.
manager = [[NSFileManager alloc] init];
contents = [manager contentsOfDirectoryAtPath:mountPoint error:&error];
@@ -159,12 +159,12 @@
{
NSString *fromPath = [mountPoint stringByAppendingPathComponent:item];
NSString *toPath = [[self.archivePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:item];
// We skip any files in the DMG which are not readable.
if (![manager isReadableFileAtPath:fromPath]) {
continue;
}
itemsCopied += 1.0;
[notifier notifyProgress:0.5 + itemsCopied/(totalItems*2.0)];
SULog(SULogLevelDefault, @"copyItemAtPath:%@ toPath:%@", fromPath, toPath);
@@ -174,10 +174,10 @@
goto reportError;
}
}
[notifier notifySuccess];
goto finally;
reportError:
[notifier notifyFailureWithError:error];
@@ -188,7 +188,7 @@
task.arguments = @[@"detach", mountPoint, @"-force"];
task.standardOutput = [NSPipe pipe];
task.standardError = [NSPipe pipe];
@try {
[task launch];
} @catch (NSException *exception) {
+1 -1
View File
@@ -170,7 +170,7 @@ static BOOL SUMakeRefFromURL(NSURL *url, FSRef *ref, NSError **error) {
if (runStatus != errAuthorizationSuccess) {
#pragma clang diagnostic pop
if (error != NULL) {
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUAuthenticationFailure userInfo:@{ NSLocalizedDescriptionKey:[NSString stringWithFormat:@"Failed to run authorization tool %s (%d).", toolPath, (int)runStatus] }];
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUAuthenticationFailure userInfo:@{ NSLocalizedDescriptionKey:[NSString stringWithFormat:@"Failed to run authorization tool %@ (%d).", [NSString stringWithCString:toolPath encoding:NSUTF8StringEncoding], (int)runStatus] }];
}
return NO;
}
+1 -1
View File
@@ -39,7 +39,7 @@
return version;
}
#endif
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpartial-availability"
return [[NSProcessInfo processInfo] operatingSystemVersion];
+2 -2
View File
@@ -170,7 +170,7 @@ static NSString *const SUUpdaterDefaultsObservationContext = @"SUUpdaterDefaults
[self showAlertText:SULocalizedString(@"Insecure feed URL is blocked in macOS 10.11", nil)
informativeText:[NSString stringWithFormat:SULocalizedString(@"You must change the feed URL (%@) to use HTTPS or disable App Transport Security.\n\nFor more information:\nhttps://sparkle-project.org/documentation/app-transport-security/", nil), [feedURL absoluteString]]];
} else if (!isMainBundle) {
SULog(SULogLevelDefault, @"WARNING: Serving updates over HTTP may be blocked in macOS 10.11. Please change the feed URL (%@) to use HTTPS. For more information:\nhttps://sparkle-project.org/documentation/app-transport-security/", feedURL);
// SULog(SULogLevelDefault, @"WARNING: Serving updates over HTTP may be blocked in macOS 10.11. Please change the feed URL (%@) to use HTTPS. For more information:\nhttps://sparkle-project.org/documentation/app-transport-security/", feedURL);
}
}
#endif
@@ -284,7 +284,7 @@ static NSString *const SUUpdaterDefaultsObservationContext = @"SUUpdaterDefaults
{
// Do not use reachability for a preflight check. This can be deceptive and a bad idea. Apple does not recommend doing it.
SUUpdateDriver *theUpdateDriver = [[([self automaticallyDownloadsUpdates] ? [SUAutomaticUpdateDriver class] : [SUScheduledUpdateDriver class])alloc] initWithUpdater:self];
[self checkForUpdatesWithDriver:theUpdateDriver];
}