Fixing #1510

microsoft · Feb 11, 2018 · 2989363 · 2989363
1 parent f89d2b5
commit 2989363
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.6.75 - 10th February, 2018
+## 0.6.76 - 10th February, 2018
 
 * [Bug 1449](https://github.com/Microsoft/vscode-go/issues/1449): Rename fails due to cgo not being able to find the go executable.  
 * [Bug 1508](https://github.com/Microsoft/vscode-go/issues/1508): Broken Path in Windows when running Go tools

diff --git a/Go-latest.vsix b/Go-latest.vsix
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Go",
-  "version": "0.6.75",
+  "version": "0.6.76",
   "publisher": "lukehoban",
   "description": "Rich Go language support for Visual Studio Code",
   "author": {

diff --git a/src/util.ts b/src/util.ts
@@ -352,8 +352,13 @@ export function getToolsEnvVars(): any {
 
 	// cgo expects go to be in the path
 	const goroot: string = envVars['GOROOT'];
-	const pathEnvVar = process.env['PATH'] ? 'PATH' : ((process.platform === 'win32' && process.env['Path']) ? 'Path' : null);
-	if (goroot && pathEnvVar && (<string>envVars[pathEnvVar]).split(path.delimiter).indexOf(goroot) === -1) {
+	let pathEnvVar: string;
+	if (envVars.hasOwnProperty('PATH')) {
+		pathEnvVar = 'PATH'
+	} else if (process.platform === 'win32' && envVars.hasOwnProperty('Path')) {
+		pathEnvVar = 'Path';
+	}
+	if (goroot && pathEnvVar && envVars[pathEnvVar] && (<string>envVars[pathEnvVar]).split(path.delimiter).indexOf(goroot) === -1) {
 		envVars[pathEnvVar] += path.delimiter + path.join(goroot, 'bin');
 	}