fix(install): passing the right cwd to the runner

watilde · Sep 8, 2017 · df8009d · df8009d
1 parent 029f4e2
commit df8009d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/lib/install/installer.js b/lib/install/installer.js
@@ -41,14 +41,14 @@ const installer = (dep, deps, base, resolve, reject) => {
 
   fetch.then(() => {
     return new Promise((resolve, reject) => {
-      const args = ['install']
+      const args = ['', 'install']
       const pkg = require(path.join(target, 'package.json'))
       if (!pkg.scripts || (
         pkg.scripts.preinstall &&
         pkg.scripts.install &&
         pkg.scripts.postinstall
       )) return resolve()
-      runner(args, pkg).then(resolve).catch(reject)
+      runner(args, pkg, target).then(resolve).catch(reject)
     })
   }).then(() => {
     global.dependenciesCount += 1

diff --git a/lib/run/runner.js b/lib/run/runner.js
@@ -2,7 +2,8 @@ const spawn = require('child_process').spawn
 const npmPath = require('npm-path')
 const each = require('promise-each')
 
-module.exports = (_, pkg) => {
+module.exports = (_, pkg, cwd) => {
+  cwd = cwd || __dirname
   const args = _.slice(1)
   const scripts = pkg.scripts
   const key = args.shift()
@@ -18,7 +19,7 @@ module.exports = (_, pkg) => {
   env[npmPath.PATH] = newPath
   return Promise.resolve(cmds).then(each((cmd) => {
     return new Promise((resolve, reject) => {
-      const script = spawn(cmd, args, {shell: true, env: env})
+      const script = spawn(cmd, args, {cwd: cwd, shell: true, env: env})
       script.stdout.on('data', (data) => {
         process.stdout.write(data)
       })
@@ -29,5 +30,7 @@ module.exports = (_, pkg) => {
         resolve()
       })
     })
-  }))
+  })).catch((e) => {
+    throw new Error(e)
+  })
 }