Apply, stop then start

keybase/context.go

@@ -126,7 +126,7 @@ func (c context) BeforeApply(update updater.Update) error {
 			return fmt.Errorf("Canceled by user from paused prompt")
 		}
 	}
-	return c.beforeApply(update)
+	return nil
 }
 
 func (c context) AfterUpdateCheck(update *updater.Update) {

keybase/platform_darwin.go

@@ -152,13 +152,6 @@ func (c context) lookupProcessPaths() (p processPaths, _ error) {
 	return p, nil
 }
 
-func (c context) beforeApply(update updater.Update) error {
-	if err := c.stop(); err != nil {
-		c.log.Warningf("Error trying to stop: %s", err)
-	}
-	return nil
-}
-
 // stop will quit the app and any services
 func (c context) stop() error {
 	// Stop app
@@ -189,6 +182,10 @@ func (c context) stop() error {
 
 // AfterApply is called after an update is applied
 func (c context) AfterApply(update updater.Update) error {
+	if err := c.stop(); err != nil {
+		c.log.Warningf("Error trying to stop: %s", err)
+	}
+
 	if err := c.start(10*time.Second, time.Second); err != nil {
 		c.log.Warningf("Error trying to start the app: %s", err)
 	}

keybase/platform_linux.go

@@ -92,10 +92,6 @@ func (c context) PausedPrompt() bool {
 	return false
 }
 
-func (c context) beforeApply(update updater.Update) error {
-	return nil
-}
-
 func (c context) Apply(update updater.Update, options updater.UpdateOptions, tmpDir string) error {
 	return nil
 }

keybase/platform_windows.go

@@ -298,10 +298,6 @@ func (c context) PausedPrompt() bool {
 	return false
 }
 
-func (c context) beforeApply(update updater.Update) error {
-	return nil
-}
-
 func (c context) Apply(update updater.Update, options updater.UpdateOptions, tmpDir string) error {
 	if update.Asset == nil || update.Asset.LocalPath == "" {
 		return fmt.Errorf("No asset")