Merge pull request nodegit#486 from nodegit/fix-prebuilt

tbranyen · tbranyen · commit 3899894483a3 · 2015-03-14T14:40:20.000-04:00
Revert node-pre-gyp to install not build
diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js
@@ -39,7 +39,7 @@ return whichNativeNodish("..")
       return checkAndBuild();
     }
     console.info("[nodegit] Fetching binary from S3.");
-    return exec("node-pre-gyp build")
+    return exec("node-pre-gyp install")
       .then(
         function() {
           console.info("[nodegit] Completed installation successfully.");
diff --git a/package.json b/package.json
@@ -93,9 +93,9 @@
     "install": "node lifecycleScripts/install",
     "installDebug": "BUILD_DEBUG=true npm install",
     "postinstall": "node lifecycleScripts/clean",
-    "recompile": "node-gyp configure build",
-    "rebuild": "node generate && node-gyp configure build",
-    "recompileDebug": "node-gyp configure --debug build",
-    "rebuildDebug": "node generate && node-gyp configure --debug build"
+    "recompile": "pangyp configure build",
+    "rebuild": "node generate && pangyp configure build",
+    "recompileDebug": "pangyp configure --debug build",
+    "rebuildDebug": "node generate && pangyp configure --debug build"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ return whichNativeNodish("..")`
`39`	`39`	`return checkAndBuild();`
`40`	`40`	`}`
`41`	`41`	`console.info("[nodegit] Fetching binary from S3.");`
`42`		`- return exec("node-pre-gyp build")`
	`42`	`+ return exec("node-pre-gyp install")`
`43`	`43`	`.then(`
`44`	`44`	`function() {`
`45`	`45`	`console.info("[nodegit] Completed installation successfully.");`
Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,9 @@`
`93`	`93`	`"install": "node lifecycleScripts/install",`
`94`	`94`	`"installDebug": "BUILD_DEBUG=true npm install",`
`95`	`95`	`"postinstall": "node lifecycleScripts/clean",`
`96`		`- "recompile": "node-gyp configure build",`
`97`		`- "rebuild": "node generate && node-gyp configure build",`
`98`		`- "recompileDebug": "node-gyp configure --debug build",`
`99`		`- "rebuildDebug": "node generate && node-gyp configure --debug build"`
	`96`	`+ "recompile": "pangyp configure build",`
	`97`	`+ "rebuild": "node generate && pangyp configure build",`
	`98`	`+ "recompileDebug": "pangyp configure --debug build",`
	`99`	`+ "rebuildDebug": "node generate && pangyp configure --debug build"`
`100`	`100`	`}`
`101`	`101`	`}`