favor easy visibility of common branching code path over happy path

Author: MMulthaupt

cmd/launcher/launcher/run.go

@@ -26,7 +26,9 @@ func Run(ctx context.Context, launcherFlags *flags.LauncherFlags) {
 	gui.SetStage(gui.StageGetDeploymentConfig, 0)
 	updater.Prepare(resources.LauncherConfig.DeploymentConfigURL)
 
-	bringLauncherToWantedVersion(updater, launcherFlags)
+	if !IsInstanceInstalledInSystemMode() && !launcherFlags.SkipSelfUpdate {
+		updateLauncherToLatestVersion(updater, launcherFlags)
+	}
 	updateBundles(ctx, updater)
 
 	gui.SetStage(gui.StageLaunchApplication, 0)
@@ -65,16 +67,9 @@ func createUpdater(ctx context.Context, handler *gui.GuiDownloadProgressHandler)
 	return updater
 }
 
-func bringLauncherToWantedVersion(updater *bundle.Updater, launcherFlags *flags.LauncherFlags) {
-	if IsInstanceInstalledInSystemMode() || launcherFlags.SkipSelfUpdate {
-		return
-	}
-	updateLauncherToLatestVersion(updater, launcherFlags)
-}
-
 func updateLauncherToLatestVersion(updater *bundle.Updater, launcherFlags *flags.LauncherFlags) {
-	updater.SetIgnoredSelfUpdateBundleInfoSHAs(resources.LauncherConfig.IgnoreLauncherBundleInfoHashes)
-	if updater.UpdateSelf() {
+	updater.SetIgnoredLauncherUpdateBundleInfoSHAs(resources.LauncherConfig.IgnoreLauncherBundleInfoHashes)
+	if updater.UpdateLauncherToLatestVersion() {
 		runPostBinaryUpdateProvisioning()
 		locking.Restart(true, launcherFlags)
 	}

pkg/launcher/bundle/update_self.go

@@ -16,7 +16,7 @@ import (
 	"github.com/setlog/trivrost/pkg/system"
 )
 
-func (u *Updater) UpdateSelf() (needsRestart bool) {
+func (u *Updater) UpdateLauncherToLatestVersion() (madeChanges bool) {
 	if u.deploymentConfig.GetLauncherUpdateConfig() == nil {
 		return false
 	}
@@ -25,7 +25,7 @@ func (u *Updater) UpdateSelf() (needsRestart bool) {
 	return u.updateProgram(programPath)
 }
 
-func (u *Updater) updateProgram(programPath string) (needsRestart bool) {
+func (u *Updater) updateProgram(programPath string) (madeChanges bool) {
 	log.Infof("Calculating local hashes.")
 	u.announceStatus(DetermineLocalLauncherVersion, 20)
 	presentState := hashing.MustHash(u.ctx, programPath)
@@ -97,12 +97,12 @@ func (u *Updater) swapBinary(localBinaryPath string, remoteURL string, newFileIn
 	}
 }
 
-func (u *Updater) SetIgnoredSelfUpdateBundleInfoSHAs(ignoreShas []string) {
-	u.ignoredSelfUpdateBundleInfoSHAs = ignoreShas
+func (u *Updater) SetIgnoredLauncherUpdateBundleInfoSHAs(ignoreShas []string) {
+	u.ignoredLauncherUpdateBundleInfoSHAs = ignoreShas
 }
 
 func (u *Updater) IsShaIgnored(sha string) bool {
-	for _, ignoreSha := range u.ignoredSelfUpdateBundleInfoSHAs {
+	for _, ignoreSha := range u.ignoredLauncherUpdateBundleInfoSHAs {
 		if ignoreSha == sha {
 			return true
 		}

pkg/launcher/bundle/updater.go

@@ -29,8 +29,8 @@ type Updater struct {
 	deploymentConfig *config.DeploymentConfig
 	publicKeys       []*rsa.PublicKey
 
-	bundleUpdateInfos               []*BundleUpdateInfo
-	ignoredSelfUpdateBundleInfoSHAs []string
+	bundleUpdateInfos                   []*BundleUpdateInfo
+	ignoredLauncherUpdateBundleInfoSHAs []string
 
 	userBundlesFolderPath   string
 	systemBundlesFolderPath string