From 74fe79ce62be1b797061e2e2af936c8bb442dd02 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 1 Jul 2013 16:06:37 +0800 Subject: [PATCH] We don't need to force updating to latest npm. --- script/bootstrap.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/script/bootstrap.py b/script/bootstrap.py index f0bf121ffd64..45f9927afb6e 100755 --- a/script/bootstrap.py +++ b/script/bootstrap.py @@ -21,10 +21,10 @@ def main(): args = parse_args() update_submodules() bootstrap_brightray(args.url) + update_node_modules() if sys.platform == 'cygwin': update_win32_python() update_atom_shell() - update_npm() def parse_args(): @@ -49,6 +49,10 @@ def bootstrap_brightray(url): subprocess.check_call([sys.executable, bootstrap, url]) +def update_node_modules(): + subprocess.check_call(['npm', 'install', '--silent']) + + def update_win32_python(): with scoped_cwd(VENDOR_DIR): if not os.path.exists('python_26'): @@ -63,12 +67,5 @@ def update_atom_shell(): subprocess.check_call([sys.executable, update]) -def update_npm(): - subprocess.check_call(['npm', 'install', 'npm', '--silent']) - - npm = os.path.join(SOURCE_ROOT, 'node_modules', '.bin', 'npm') - subprocess.check_call([npm, 'install', '--silent']) - - if __name__ == '__main__': sys.exit(main())