Get the right path for tools.

joshaber · John Haley · commit adb5bea310ed · 2015-12-08T16:06:42.000-07:00
diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js
@@ -26,7 +26,8 @@ return installPrebuilt();
 
 function installPrebuilt() {
   console.info("[nodegit] Fetching binary from S3.");
-  return exec("node-pre-gyp install --fallback-to-build=false")
+  var npg = pathForTool("node-pre-gyp");
+  return exec(npg + " install --fallback-to-build=false")
     .then(
       function() {
         console.info("[nodegit] Completed installation successfully.");
@@ -41,6 +42,13 @@ function installPrebuilt() {
 }
 
 
+function pathForTool(name) {
+  var toolPath = path.resolve(".", "node_modules", ".bin", name);
+  toolPath = toolPath.replace(/\s/g, "\\$&");
+  return toolPath;
+}
+
+
 function prepareAndBuild() {
   console.info("[nodegit] Regenerating and configuring code");
   return prepareForBuild()
@@ -59,15 +67,13 @@ function build() {
   };
 
   var debug = (process.env.BUILD_DEBUG ? " --debug" : "");
-  var builder = "node-gyp";
 
   var home = process.platform == "win32" ?
               process.env.USERPROFILE : process.env.HOME;
 
   opts.env.HOME = path.join(home, ".nodegit-gyp");
 
-  builder = path.resolve(".", "node_modules", ".bin", builder);
-  builder = builder.replace(/\s/g, "\\$&");
+  var builder = pathForTool("node-gyp");
   var cmd = [builder, "rebuild", debug].join(" ").trim();
 
   return exec(cmd, opts)
