Fix npm registry detection

maxkorp · John Haley · commit 3fe3b98174e1 · 2015-12-08T16:06:43.000-07:00
diff --git a/.didntcomefromthenpmregistry b/.didntcomefromthenpmregistry
diff --git a/.npmignore b/.npmignore
@@ -15,7 +15,6 @@
 .jshintrc
 .travis.yml
 appveyor.yml
-.didntcomefromthenpmregistry
 
 *.vcxproj
 *.filters
diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js
@@ -8,9 +8,18 @@ var exec = promisify(function(command, opts, callback) {
   return require("child_process").exec(command, opts, callback);
 });
 
-var local = path.join.bind(path, __dirname);
+var fromRegistry;
+try {
+  fs.statSync(path.join(__dirname, "..", "include"));
+  fs.statSync(path.join(__dirname, "..", "src"));
+  fromRegistry = true;
+}
+catch(e) {
+  fromRegistry = false;
+}
 
-if (fs.existsSync(local("../.didntcomefromthenpmregistry"))) {
+if (fromRegistry) {
+  console.info("[nodegit] Local install, no fetching allowed.");
   return prepareAndBuild();
 }
 if (process.env.BUILD_DEBUG) {
@@ -41,14 +50,12 @@ 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()
@@ -73,8 +80,7 @@ function build() {
 
   opts.env.HOME = path.join(home, ".nodegit-gyp");
 
-  var builder = pathForTool("node-gyp");
-  var cmd = [builder, "rebuild", debug].join(" ").trim();
+  var cmd = [pathForTool("node-gyp"), "rebuild", debug].join(" ").trim();
 
   return exec(cmd, opts)
     .then(function() {
