Merge pull request facebook#4835 from udnisap/feature-npm-progress-on…

…-init npm progress shown on react init
arian · Dec 22, 2015 · 2d72687 · 2d72687
2 parents 5384c47 + 5da0e13
commit 2d72687
Showing 1 changed file with 10 additions and 23 deletions.
diff --git a/react-native-cli/index.js b/react-native-cli/index.js
@@ -180,37 +180,24 @@ function createProject(name, verbose) {
 
   console.log('Installing react-native package from npm...');
 
-  if (verbose) {
-    runVerbose(root, projectName);
-  } else {
-    run(root, projectName);
-  }
+  run(root, projectName, verbose);
 }
 
-function run(root, projectName) {
-  exec('npm install --save react-native', function(e, stdout, stderr) {
-    if (e) {
-      console.log(stdout);
-      console.error(stderr);
-      console.error('`npm install --save react-native` failed');
-      process.exit(1);
-    }
-
-    checkNodeVersion();
-
-    var cli = require(CLI_MODULE_PATH());
-    cli.init(root, projectName);
-  });
-}
-
-function runVerbose(root, projectName) {
-  var proc = spawn('npm', ['install', '--verbose', '--save', 'react-native'], {stdio: 'inherit'});
+function run(root, projectName, verbose) {
+  var args = ['install', '--save'];
+  if (verbose){
+    args.push('--verbose');
+  }
+  args.push('react-native');
+  var proc = spawn('npm', args, {stdio: 'inherit'});
   proc.on('close', function (code) {
     if (code !== 0) {
       console.error('`npm install --save react-native` failed');
       return;
     }
 
+    checkNodeVersion();
+
     cli = require(CLI_MODULE_PATH());
     cli.init(root, projectName);
   });