Merge pull request atom#1683 from atom/ks-npm-remove-strict-ssl

npm ca issue
briangonzalez · Mar 4, 2014 · d2a6aa5 · d2a6aa5
2 parents a1ad10b + 71abe66
commit d2a6aa5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1,2 @@
+ca =
+cache = ~/.atom/.npm
diff --git a/script/bootstrap b/script/bootstrap
@@ -28,14 +28,15 @@ if (!fs.existsSync(path.join(apmInstallPath, 'node_modules')))
 var apmPath = 'apm/node_modules/atom-package-manager/bin/apm'
 var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? '--no-color' : '';
 var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season'];
+var npmCommand = 'npm --userconfig=' + path.resolve('.npmrc') + ' ';
 var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo';
 var commands = [
   'git submodule --quiet sync',
   'git submodule --quiet update --recursive --init',
-  {command: 'npm --strict-ssl=false install --quiet', options: {cwd: path.resolve(__dirname, '..', 'build'), ignoreStdout: true}},
-  {command: 'npm --strict-ssl=false install --quiet', options: {cwd: apmVendorPath, ignoreStdout: true}},
-  {command: 'npm --strict-ssl=false install --quiet ' + apmVendorPath, options: {cwd: apmInstallPath, ignoreStdout: true}},
-  {command: 'npm --strict-ssl=false install --quiet ' + apmVendorPath, options: {ignoreStdout: true}},
+  {command: npmCommand + 'install --quiet', options: {cwd: path.resolve(__dirname, '..', 'build'), ignoreStdout: true}},
+  {command: npmCommand + 'install --quiet', options: {cwd: apmVendorPath, ignoreStdout: true}},
+  {command: npmCommand + 'install --quiet ' + apmVendorPath, options: {cwd: apmInstallPath, ignoreStdout: true}},
+  {command: npmCommand + 'install --quiet ' + apmVendorPath, options: {ignoreStdout: true}},
   {command: '../../' + apmPath + ' rebuild', options: {cwd: path.resolve('node_modules', 'atom-package-manager'), ignoreStdout: true}},
   echoNewLine,
   apmPath + ' clean ' + apmFlags,

diff --git a/script/clean b/script/clean
@@ -22,6 +22,7 @@ var commands = [
   [__dirname, '..', 'atom-shell'],
   [home, '.atom', '.node-gyp'],
   [home, '.atom', 'storage'],
+  [home, '.atom', '.npm'],
   [tmpdir, 'atom-build'],
   [tmpdir, 'atom-cached-atom-shells'],
   [tmpdir, 'atom-compile-cache'],