Merge pull request #48 from cnpm/remove-fsevents

fix: fsevents use binary-mirror-config too
cnpm · Mar 9, 2016 · 395392f · 395392f
2 parents 1cfff5f + da8c7f4
commit 395392f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/bin/install.js b/bin/install.js
@@ -152,6 +152,7 @@ co(function*() {
       binaryMirrors = res.data.mirrors.china;
     } catch (err) {
       debug('Get %s error: %s', binaryMirrorUrl, err);
+      binaryMirrors = require('binary-mirror-config/package.json').mirrors.china;
     }
   }
 

diff --git a/lib/config.js b/lib/config.js
@@ -26,16 +26,8 @@ const config = {
     OPERADRIVER_CDNURL: 'https://npm.taobao.org/mirrors/operadriver',
     ELECTRON_MIRROR: 'https://npm.taobao.org/mirrors/electron/',
     SASS_BINARY_SITE: 'https://npm.taobao.org/mirrors/node-sass',
-    npm_config_fse_binary_host_mirror: 'https://npm.taobao.org/mirrors/fsevents/',
   },
   chineseRegistry: 'https://registry.npm.taobao.org',
 };
 
-// travis ci download from orginal cdn
-if (process.env.CI) {
-  config.env = {
-    npm_config_loglevel: 'http',
-  };
-}
-
 module.exports = config;
diff --git a/package.json b/package.json
@@ -41,7 +41,8 @@
     "tar": "~2.2.1",
     "urllib": "~2.7.1",
     "utility": "~1.6.0",
-    "minimist": "~1.2.0"
+    "minimist": "~1.2.0",
+    "binary-mirror-config": "^1.0.1"
   },
   "devDependencies": {
     "autod": "*",