When using GOBIN, the message should reflect the same

microsoft · Jan 28, 2020 · 83e3360 · 83e3360
1 parent 8660153
commit 83e3360
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/goInstallTools.ts b/src/goInstallTools.ts
@@ -144,13 +144,13 @@ export function installTools(missing: Tool[], goVersion: GoVersion): Promise<voi
  return;
  }
 
- let binpath = toolsGopath + path.sep + "bin";
- if(envForTools['GOBIN'] != undefined && envForTools['GOBIN'] != ''){
- binpath = "GOBIN path " + envForTools['GOBIN']
+ let installingMsg = `Installing ${missing.length} ${missing.length > 1 ? 'tools' : 'tool'} at `;
+ if (envForTools['GOBIN']) {
+ installingMsg += `the configured GOBIN: ${envForTools['GOBIN']}`;
+ } else {
+ installingMsg += toolsGopath + path.sep + 'bin';
  }
 
- let installingMsg = `Installing ${missing.length} ${missing.length > 1 ? 'tools' : 'tool'} at ${binpath}`;
-
  // If the user is on Go >= 1.11, tools should be installed with modules enabled.
  // This ensures that users get the latest tagged version, rather than master,
  // which may be unstable.

diff --git a/src/goPath.ts b/src/goPath.ts
@@ -46,7 +46,7 @@ export function getBinPathWithPreferredGopath(toolName: string, preferredGopaths
  binPathCache[toolName] = pathFromGoBin;
  return pathFromGoBin;
  }
- 
+
  for (const preferred of preferredGopaths) {
  if (typeof preferred === 'string') {
  // Search in the preferred GOPATH workspace's bin folder