fixup! internal/cmd/update.go: validate we can exec new binary

johnstcn · johnstcn · commit 20028766da50 · 2021-08-16T12:39:30.000Z
diff --git a/internal/cmd/update.go b/internal/cmd/update.go
@@ -131,11 +131,9 @@ func (u *updater) Run(ctx context.Context, force bool, coderURLArg string, versi
 	currentVersion, err := semver.StrictNewVersion(u.versionF())
 	if err != nil {
 		clog.LogWarn("failed to determine current version of coder-cli", clog.Causef(err.Error()))
-	} else {
-		if currentVersion.Compare(desiredVersion) == 0 {
-			clog.LogInfo("Up to date!")
-			return nil
-		}
+	} else if currentVersion.Compare(desiredVersion) == 0 {
+		clog.LogInfo("Up to date!")
+		return nil
 	}
 
 	if !force {
diff --git a/internal/cmd/update_test.go b/internal/cmd/update_test.go
@@ -22,16 +22,15 @@ import (
 )
 
 const (
-	fakeExePathLinux        = "/home/user/bin/coder"
-	fakeUpdatedExePathLinux = "/home/user/bin/coder.new"
-	fakeExePathWindows      = `C:\Users\user\bin\coder.exe`
-	fakeCoderURL            = "https://my.cdr.dev"
-	fakeNewVersion          = "1.23.4-rc.5+678-gabcdef-12345678"
-	fakeOldVersion          = "1.22.4-rc.5+678-gabcdef-12345678"
-	fakeReleaseURLLinux     = "https://github.com/cdr/coder-cli/releases/download/v1.23.4-rc.5/coder-cli-linux-amd64.tar.gz"
-	fakeReleaseURLWindows   = "https://github.com/cdr/coder-cli/releases/download/v1.23.4-rc.5/coder-cli-windows-amd64.zip"
-	goosWindows             = "windows"
-	goosLinux               = "linux"
+	fakeExePathLinux      = "/home/user/bin/coder"
+	fakeExePathWindows    = `C:\Users\user\bin\coder.exe`
+	fakeCoderURL          = "https://my.cdr.dev"
+	fakeNewVersion        = "1.23.4-rc.5+678-gabcdef-12345678"
+	fakeOldVersion        = "1.22.4-rc.5+678-gabcdef-12345678"
+	fakeReleaseURLLinux   = "https://github.com/cdr/coder-cli/releases/download/v1.23.4-rc.5/coder-cli-linux-amd64.tar.gz"
+	fakeReleaseURLWindows = "https://github.com/cdr/coder-cli/releases/download/v1.23.4-rc.5/coder-cli-windows-amd64.zip"
+	goosWindows           = "windows"
+	goosLinux             = "linux"
 )
 
 var (
