diff --git a/Autoupdate/AppInstaller.m b/Autoupdate/AppInstaller.m index 7d8dbbf0..9f13b664 100644 --- a/Autoupdate/AppInstaller.m +++ b/Autoupdate/AppInstaller.m @@ -561,10 +561,6 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7; return; } - // Used later for relaunching - // Compute this now before we set this installer property to nil - NSString *installationPath = [self.installer installationPath]; - NSError *thirdStageError = nil; if (![self.installer performFinalInstallationProgressBlock:nil error:&thirdStageError]) { [self.installer performCleanup]; diff --git a/Autoupdate/SUGuidedPackageInstaller.h b/Autoupdate/SUGuidedPackageInstaller.h index 29e9389f..e297cf7c 100644 --- a/Autoupdate/SUGuidedPackageInstaller.h +++ b/Autoupdate/SUGuidedPackageInstaller.h @@ -21,6 +21,6 @@ A guided installation can be started by applications other than the application @interface SUGuidedPackageInstaller : NSObject -- (instancetype)initWithPackagePath:(NSString *)packagePath installationPath:(NSString *)installationPath; +- (instancetype)initWithPackagePath:(NSString *)packagePath; @end diff --git a/Autoupdate/SUGuidedPackageInstaller.m b/Autoupdate/SUGuidedPackageInstaller.m index 402e8aff..5632f0ae 100644 --- a/Autoupdate/SUGuidedPackageInstaller.m +++ b/Autoupdate/SUGuidedPackageInstaller.m @@ -16,21 +16,18 @@ @interface SUGuidedPackageInstaller () @property (nonatomic, readonly, copy) NSString *packagePath; -@property (nonatomic, readonly, copy) NSString *installationPath; @end @implementation SUGuidedPackageInstaller @synthesize packagePath = _packagePath; -@synthesize installationPath = _installationPath; -- (instancetype)initWithPackagePath:(NSString *)packagePath installationPath:(NSString *)installationPath +- (instancetype)initWithPackagePath:(NSString *)packagePath { self = [super init]; if (self != nil) { _packagePath = [packagePath copy]; - _installationPath = [installationPath copy]; } return self; } diff --git a/Autoupdate/SUInstaller.m b/Autoupdate/SUInstaller.m index 553c12b0..7db302e8 100644 --- a/Autoupdate/SUInstaller.m +++ b/Autoupdate/SUInstaller.m @@ -135,7 +135,7 @@ *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Found guided package installer but '%@=%@' was probably missing in the appcast item enclosure", SUAppcastAttributeInstallationType, SPUInstallationTypeGuidedPackage] }]; } } else { - installer = [[SUGuidedPackageInstaller alloc] initWithPackagePath:newDownloadPath installationPath:host.bundlePath]; + installer = [[SUGuidedPackageInstaller alloc] initWithPackagePath:newDownloadPath]; } } else if (isPackage) { if (![expectedInstallationType isEqualToString:SPUInstallationTypeInteractivePackage]) { @@ -143,7 +143,7 @@ *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Found package installer but '%@=%@' was probably missing in the appcast item enclosure", SUAppcastAttributeInstallationType, SPUInstallationTypeInteractivePackage] }]; } } else { - installer = [[SUPackageInstaller alloc] initWithPackagePath:newDownloadPath installationPath:host.bundlePath]; + installer = [[SUPackageInstaller alloc] initWithPackagePath:newDownloadPath]; } } else { if (![expectedInstallationType isEqualToString:SPUInstallationTypeApplication]) { diff --git a/Autoupdate/SUInstallerProtocol.h b/Autoupdate/SUInstallerProtocol.h index 86fb6f3d..c574bf41 100644 --- a/Autoupdate/SUInstallerProtocol.h +++ b/Autoupdate/SUInstallerProtocol.h @@ -33,9 +33,6 @@ NS_ASSUME_NONNULL_BEGIN // Should be thread safe - (BOOL)canInstallSilently; -// The destination and installation path of the bundle being updated -- (NSString *)installationPath; - @end NS_ASSUME_NONNULL_END diff --git a/Autoupdate/SUPackageInstaller.h b/Autoupdate/SUPackageInstaller.h index b4375618..779118af 100644 --- a/Autoupdate/SUPackageInstaller.h +++ b/Autoupdate/SUPackageInstaller.h @@ -14,6 +14,6 @@ @interface SUPackageInstaller : NSObject -- (instancetype)initWithPackagePath:(NSString *)packagePath installationPath:(NSString *)installationPath; +- (instancetype)initWithPackagePath:(NSString *)packagePath; @end diff --git a/Autoupdate/SUPackageInstaller.m b/Autoupdate/SUPackageInstaller.m index aaaa2e16..056567fb 100644 --- a/Autoupdate/SUPackageInstaller.m +++ b/Autoupdate/SUPackageInstaller.m @@ -17,7 +17,6 @@ @interface SUPackageInstaller () @property (nonatomic, readonly, copy) NSString *packagePath; -@property (nonatomic, readonly, copy) NSString *installationPath; @end @@ -26,14 +25,12 @@ static NSString *SUOpenUtilityPath = @"/usr/bin/open"; @synthesize packagePath = _packagePath; -@synthesize installationPath = _installationPath; -- (instancetype)initWithPackagePath:(NSString *)packagePath installationPath:(NSString *)installationPath +- (instancetype)initWithPackagePath:(NSString *)packagePath { self = [super init]; if (self != nil) { _packagePath = [packagePath copy]; - _installationPath = [installationPath copy]; } return self; }