Allow configuring the update notifier from the outside

mislav · mislav · commit ba0a441e23a5 · 2019-12-04T15:07:10.000+01:00
To test the update notifier:

    rm -f bin/gh; GH_VERSION=v0.2.3 LDFLAGS='-X main.updaterEnabled=github/homebrew-gh' make
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -9,7 +9,7 @@ builds:
       - -s -w -X github.com/github/gh-cli/command.Version={{.Version}} -X github.com/github/gh-cli/command.BuildDate={{.Date}}
       - -X github.com/github/gh-cli/context.oauthClientID={{.Env.GH_OAUTH_CLIENT_ID}}
       - -X github.com/github/gh-cli/context.oauthClientSecret={{.Env.GH_OAUTH_CLIENT_SECRET}}
-      - -X github.com/github/gh-cli.updaterEnabled=yes
+      - -X main.updaterEnabled=github/homebrew-gh
     goos:
       - linux
       - darwin
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 BUILD_FILES = $(shell go list -f '{{range .GoFiles}}{{$$.Dir}}/{{.}}\
 {{end}}' ./...)
 
-GH_VERSION = $(shell git describe --tags 2>/dev/null || git rev-parse --short HEAD)
+GH_VERSION ?= $(shell git describe --tags 2>/dev/null || git rev-parse --short HEAD)
 LDFLAGS := -X github.com/github/gh-cli/command.Version=$(GH_VERSION) $(LDFLAGS)
 LDFLAGS := -X github.com/github/gh-cli/command.BuildDate=$(shell date +%Y-%m-%d) $(LDFLAGS)
 ifdef GH_OAUTH_CLIENT_SECRET
diff --git a/main.go b/main.go
@@ -12,7 +12,7 @@ import (
 	"github.com/mgutz/ansi"
 )
 
-var updaterEnabled = "no"
+var updaterEnabled = ""
 
 func main() {
 	currentVersion := command.Version
@@ -42,7 +42,7 @@ Release notes: %s`, currentVersion, newRelease.Version, newRelease.URL)
 
 func shouldCheckForUpdate() bool {
 	errFd := os.Stderr.Fd()
-	return updaterEnabled == "yes" && (isatty.IsTerminal(errFd) || isatty.IsCygwinTerminal(errFd))
+	return updaterEnabled != "" && (isatty.IsTerminal(errFd) || isatty.IsCygwinTerminal(errFd))
 }
 
 func checkForUpdate(currentVersion string) (*update.ReleaseInfo, error) {
@@ -55,5 +55,6 @@ func checkForUpdate(currentVersion string) (*update.ReleaseInfo, error) {
 		return nil, err
 	}
 
-	return update.CheckForUpdate(client, "github/homebrew-gh", currentVersion)
+	repo := updaterEnabled
+	return update.CheckForUpdate(client, repo, currentVersion)
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"github.com/mgutz/ansi"`
`13`	`13`	`)`
`14`	`14`
`15`		`-var updaterEnabled = "no"`
	`15`	`+var updaterEnabled = ""`
`16`	`16`
`17`	`17`	`func main() {`
`18`	`18`	`currentVersion := command.Version`
@@ -42,7 +42,7 @@ Release notes: %s`, currentVersion, newRelease.Version, newRelease.URL)
`42`	`42`
`43`	`43`	`func shouldCheckForUpdate() bool {`
`44`	`44`	`errFd := os.Stderr.Fd()`
`45`		`- return updaterEnabled == "yes" && (isatty.IsTerminal(errFd) \|\| isatty.IsCygwinTerminal(errFd))`
	`45`	`+ return updaterEnabled != "" && (isatty.IsTerminal(errFd) \|\| isatty.IsCygwinTerminal(errFd))`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`func checkForUpdate(currentVersion string) (*update.ReleaseInfo, error) {`
`@@ -55,5 +55,6 @@ func checkForUpdate(currentVersion string) (*update.ReleaseInfo, error) {`
`55`	`55`	`return nil, err`
`56`	`56`	`}`
`57`	`57`
`58`		`- return update.CheckForUpdate(client, "github/homebrew-gh", currentVersion)`
	`58`	`+ repo := updaterEnabled`
	`59`	`+ return update.CheckForUpdate(client, repo, currentVersion)`
`59`	`60`	`}`