Ensure default GOBIN is relative to GOPATH

doesdev · Apr 15, 2018 · 699fce9 · 699fce9
1 parent 0763a07
commit 699fce9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -7,7 +7,6 @@ const exists = require('fs').existsSync
 const vendor = path.resolve(__dirname, 'vendor')
 const defGoRoot = path.join(vendor, 'go')
 const defGoPath = path.join(vendor, 'gopath')
-const defGoBin = path.join(defGoPath, 'bin')
 const cpu64 = (process.env.PROCESSOR_ARCHITECTURE || '').indexOf('64') !== -1
 const arch = (cpu64 || process.arch.indexOf('64') !== -1) ? 'amd64' : '386'
 
@@ -18,7 +17,7 @@ module.exports = (opts = {}) => {
   if (opts.useLocal) goRoot = defGoRoot
   env.GOROOT = goRoot = goRoot || env.GOROOT || defGoRoot
   env.GOPATH = goPath = goPath || env.GOPATH || defGoPath
-  env.GOBIN = goBin = goBin || env.GOBIN || defGoBin
+  env.GOBIN = goBin = goBin || env.GOBIN || path.join(goPath, 'bin')
   env.GOARCH = goArch = goArch || env.GOARCH || arch
   env.ngoBin = path.join(goRoot, 'bin', 'go')
   try { env.hasBin = exists(path.join(goRoot, 'bin')) } catch (ex) {}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngo",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "description": "Run Go commands from Node or CLI, Go env not required",
   "engines": {
     "node": ">=6.0.0"