Fix accidental variable shadowing that broke version resolution. (#186)

fweikert · web-flow · commit dba981e4e82b · 2020-10-16T16:46:08.000+02:00
Fixes #185
diff --git a/core/core.go b/core/core.go
@@ -80,7 +80,8 @@ func RunBazelisk(args []string, repos *Repositories) (int, error) {
 			return -1, fmt.Errorf("could not parse Bazel fork and version: %v", err)
 		}
 
-		resolvedBazelVersion, downloader, err := repos.ResolveVersion(bazeliskHome, bazelFork, bazelVersion)
+		var downloader DownloadFunc
+		resolvedBazelVersion, downloader, err = repos.ResolveVersion(bazeliskHome, bazelFork, bazelVersion)
 		if err != nil {
 			return -1, fmt.Errorf("could not resolve the version '%s' to an actual version number: %v", bazelVersion, err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,8 @@ func RunBazelisk(args []string, repos *Repositories) (int, error) {`
`80`	`80`	`return -1, fmt.Errorf("could not parse Bazel fork and version: %v", err)`
`81`	`81`	`}`
`82`	`82`
`83`		`- resolvedBazelVersion, downloader, err := repos.ResolveVersion(bazeliskHome, bazelFork, bazelVersion)`
	`83`	`+ var downloader DownloadFunc`
	`84`	`+ resolvedBazelVersion, downloader, err = repos.ResolveVersion(bazeliskHome, bazelFork, bazelVersion)`
`84`	`85`	`if err != nil {`
`85`	`86`	`return -1, fmt.Errorf("could not resolve the version '%s' to an actual version number: %v", bazelVersion, err)`
`86`	`87`	`}`