github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into win32-specs

Browse Source 
Conflicts:
	tasks/spec-task.coffee
This commit is contained in:
Matt Colyer
2013-12-18 09:34:28 -08:00
parent 8366887df6 9198f3b809
commit bf021ab7f7
5 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
script/bootstrap
View File

@@ -37,6 +37,8 @@ var commands = [
'git submodule --quiet update --recursive --init',
{command: 'npm install --quiet', options: {cwd: apmVendorPath, ignoreStdout: true}},
{command: 'npm install --quiet ' + apmVendorPath, options: {cwd: apmInstallPath, ignoreStdout: true}},
{command: 'npm install --quiet ' + apmVendorPath, options: {ignoreStdout: true}},
{command: 'node ../../apm/node_modules/atom-package-manager/bin/apm rebuild', options: {cwd: path.resolve('node_modules', 'atom-package-manager'), ignoreStdout: true}},
echoNewLine,
'node apm/node_modules/atom-package-manager/bin/apm clean ' + apmFlags,
'node apm/node_modules/atom-package-manager/bin/apm install --quiet ' + apmFlags,