fix http_parser in v10

maxkorp · maxkorp · commit 444cf45b525f · 2015-01-22T11:19:37.000-07:00
diff --git a/lifecycleScripts/checkPrepared.js b/lifecycleScripts/checkPrepared.js
@@ -4,6 +4,8 @@ var fs = require("fs");
 var rooted = path.join.bind(path, __dirname, "..");
 var pkg = require(rooted("package"));
 
+var NODE_VERSION = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
+
 module.exports.checkAll = function checkAll() {
   return Promise.all([
     checkVendor("libgit2"),
@@ -31,7 +33,15 @@ function checkExists(name) {
 module.exports.checkExists = checkExists;
 
 function checkVendor(name, skipVersion) {
-  var version = skipVersion ? "" : (pkg[name].sha || pkg[name].version);
+  var version = "";
+  if (!skipVersion) {
+    var vendorPackage = pkg[name];
+    if (NODE_VERSION === 0.1 && vendorPackage["0.10"]) {
+      vendorPackage = vendorPackage["0.10"];
+    }
+    version = vendorPackage.sha || vendorPackage.version;
+  }
+
   var vendorPath = "vendor/" + name + "/" + version;
   return checkExists(vendorPath);
 }
diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js
@@ -15,8 +15,7 @@ var exec = promisify(function(command, opts, callback) {
   return require("child_process").exec(command, opts, callback);
 });
 
-
-forNodeWebkit(local(".."))
+return forNodeWebkit(local(".."))
   .then(function(results) {
     return results.nwVersion;
   })
@@ -41,14 +40,13 @@ forNodeWebkit(local(".."))
       .then(
         function() {
           console.info("[nodegit] Completed installation successfully.");
-          return Promise.done();
         },
         function() {
           console.info("[nodegit] Failed to install prebuilt binary, building manually.");
           return checkAndBuild();
         }
       );
-  })
+  });
 
 
 function checkAndBuild(nwVersion) {
diff --git a/lifecycleScripts/retrieveExternalDependencies.js b/lifecycleScripts/retrieveExternalDependencies.js
@@ -13,6 +13,8 @@ var pkg = require(rooted("package"));
 var tar;
 var request;
 
+var NODE_VERSION = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
+
 module.exports = function retrieveExternalDependencies() {
   tar = require("tar");
   request = require("request");
@@ -26,7 +28,12 @@ module.exports = function retrieveExternalDependencies() {
 
 function getVendorLib(name, url) {
   var vendorPath = "vendor/" + name + "/";
-  var version = pkg[name].sha || pkg[name].version;
+  var vendorPackage = pkg[name];
+  if (NODE_VERSION === 0.1 && vendorPackage["0.10"]) {
+    vendorPackage = vendorPackage["0.10"];
+  }
+
+  var version = vendorPackage.sha || vendorPackage.version;
 
   console.info("[nodegit] Detecting " + vendorPath + ".");
   return check(name)
