Sparkle now correctly relaunches WebKit instead of Safari after insta…

…lling an update Signed-off-by: Jonathan 'Wolf' Rentzsch <jwr.git@redshed.net>
rentzsch · May 5, 2009 · e8dadfd · e8dadfd
1 parent 6b60d2d
commit e8dadfd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Plugin/Plugin.m b/Plugin/Plugin.m
@@ -90,7 +90,11 @@ - (id) initWithArguments:(NSDictionary *)arguments
 {
     self = [super init];
     if (self) {
-        [[SparkleManager sharedManager] startAutomaticallyCheckingForUpdates];
+		SparkleManager *sharedSparkleManager = [SparkleManager sharedManager];
+		NSWorkspace *sharedWorkspace = [NSWorkspace sharedWorkspace];
+		NSString *pathToRelaunch = [sharedWorkspace absolutePathForAppBundleWithIdentifier:[self launchedAppBundleIdentifier]];
+		[sharedSparkleManager setPathToRelaunch:pathToRelaunch];
+        [sharedSparkleManager startAutomaticallyCheckingForUpdates];
 
         if (![[NSUserDefaults standardUserDefaults] objectForKey:sAutoLoadInvisibleFlashViewsKey]) {
             //  Default to auto-loading invisible flash views.

diff --git a/SparkleManager.h b/SparkleManager.h
@@ -31,6 +31,7 @@
 @interface SparkleManager : NSObject {
     SUUpdater *_updater;
     BOOL _canUpdate;
+	NSString *_pathToRelaunch;
 }
 
 + (id)sharedManager;
@@ -39,4 +40,6 @@
 - (void)startAutomaticallyCheckingForUpdates;
 - (void)checkForUpdates;
 
+@property (retain) NSString *pathToRelaunch;
+
 @end
diff --git a/SparkleManager.m b/SparkleManager.m
@@ -117,7 +117,9 @@ - (void)checkForUpdates {
 }
 
 - (NSString*)pathToRelaunchForUpdater:(SUUpdater*)updater {
-    return [[NSBundle mainBundle] bundlePath];
+    return _pathToRelaunch;
 }
 
+@synthesize pathToRelaunch = _pathToRelaunch;
+
 @end