From f921c0122128a26d728953c5ed72e9253c22b066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= <thymikee@gmail.com>
Date: Wed, 31 Jul 2019 21:50:51 +0200
Subject: [PATCH 1/2] fix: fallback to default terminal if wrong one passed

---
 .../src/commands/runAndroid/index.js          | 47 +++++++++++++------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/packages/platform-android/src/commands/runAndroid/index.js b/packages/platform-android/src/commands/runAndroid/index.js
index c0bb903d1..6466a2a9b 100644
--- a/packages/platform-android/src/commands/runAndroid/index.js
+++ b/packages/platform-android/src/commands/runAndroid/index.js
@@ -9,7 +9,6 @@
 
 import path from 'path';
 import execa from 'execa';
-import {spawnSync, spawn, execFileSync} from 'child_process';
 import chalk from 'chalk';
 import fs from 'fs';
 import type {ConfigT} from 'types';
@@ -87,7 +86,19 @@ async function runAndroid(argv: Array<string>, config: ConfigT, args: FlagsT) {
     } else {
       // result == 'not_running'
       logger.info('Starting JS server...');
-      startServerInNewWindow(args.port, args.terminal, config.reactNativePath);
+      try {
+        startServerInNewWindow(
+          args.port,
+          args.terminal,
+          config.reactNativePath,
+        );
+      } catch (error) {
+        logger.warn(
+          `Failed to automatically start the packager server. Please run "react-native start" manually. Error details: ${
+            error.message
+          }`,
+        );
+      }
     }
     return buildAndRun(args);
   });
@@ -178,7 +189,7 @@ function buildApk(gradlew) {
     const gradleArgs = ['build', '-x', 'lint'];
     logger.info('Building the app...');
     logger.debug(`Running command "${gradlew} ${gradleArgs.join(' ')}"`);
-    execFileSync(gradlew, gradleArgs, {stdio: 'inherit'});
+    execa.sync(gradlew, gradleArgs, {stdio: 'inherit'});
   } catch (error) {
     throw new CLIError('Failed to build the app.', error);
   }
@@ -204,7 +215,7 @@ function tryInstallAppOnDevice(args, adbPath, device) {
     logger.debug(
       `Running command "cd android && adb -s ${device} install -r -d ${pathToApk}"`,
     );
-    execFileSync(adbPath, adbArgs, {stdio: 'inherit'});
+    execa.sync(adbPath, adbArgs, {stdio: 'inherit'});
   } catch (error) {
     throw new CLIError('Failed to install the app on the device.', error);
   }
@@ -310,23 +321,29 @@ function startServerInNewWindow(port, terminal, reactNativePath) {
   });
 
   if (process.platform === 'darwin') {
-    if (terminal) {
-      return spawnSync(
+    try {
+      return execa.sync(
         'open',
         ['-a', terminal, launchPackagerScript],
         procConfig,
       );
+    } catch (error) {
+      return execa.sync('open', [launchPackagerScript], procConfig);
     }
-    return spawnSync('open', [launchPackagerScript], procConfig);
   }
   if (process.platform === 'linux') {
-    if (terminal) {
-      procConfig.detached = true;
-      return spawn(terminal, ['-e', `sh ${launchPackagerScript}`], procConfig);
+    try {
+      return execa.sync(terminal, ['-e', `sh ${launchPackagerScript}`], {
+        ...procConfig,
+        detached: true,
+      });
+    } catch (error) {
+      // By default, the child shell process will be attached to the parent
+      return execa.sync('sh', [launchPackagerScript], {
+        ...procConfig,
+        detached: false,
+      });
     }
-    // By default, the child shell process will be attached to the parent
-    procConfig.detached = false;
-    return spawn('sh', [launchPackagerScript], procConfig);
   }
   if (/^win/.test(process.platform)) {
     procConfig.detached = true;
@@ -336,7 +353,7 @@ function startServerInNewWindow(port, terminal, reactNativePath) {
       encoding: 'utf8',
       flag: 'w',
     });
-    return spawn('cmd.exe', ['/C', launchPackagerScript], procConfig);
+    return execa.sync('cmd.exe', ['/C', launchPackagerScript], procConfig);
   }
   logger.error(
     `Cannot start the packager. Unknown platform ${process.platform}`,
@@ -400,7 +417,7 @@ export default {
       name: '--terminal [string]',
       description:
         'Launches the Metro Bundler in a new window using the specified terminal path.',
-      default: getDefaultUserTerminal,
+      default: getDefaultUserTerminal(),
     },
     {
       name: '--tasks [list]',

From ec9d261df011891effc8b4368065f4b45f9a48e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= <thymikee@gmail.com>
Date: Wed, 31 Jul 2019 22:04:00 +0200
Subject: [PATCH 2/2] less mutation

---
 .../src/commands/runAndroid/index.js                | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/platform-android/src/commands/runAndroid/index.js b/packages/platform-android/src/commands/runAndroid/index.js
index 6466a2a9b..cf11697ab 100644
--- a/packages/platform-android/src/commands/runAndroid/index.js
+++ b/packages/platform-android/src/commands/runAndroid/index.js
@@ -339,21 +339,20 @@ function startServerInNewWindow(port, terminal, reactNativePath) {
       });
     } catch (error) {
       // By default, the child shell process will be attached to the parent
-      return execa.sync('sh', [launchPackagerScript], {
-        ...procConfig,
-        detached: false,
-      });
+      return execa.sync('sh', [launchPackagerScript], procConfig);
     }
   }
   if (/^win/.test(process.platform)) {
-    procConfig.detached = true;
-    procConfig.stdio = 'ignore';
     //Temporary fix for #484. See comment on line 254
     fs.writeFileSync(launchPackagerScript, launchPackagerScriptContent, {
       encoding: 'utf8',
       flag: 'w',
     });
-    return execa.sync('cmd.exe', ['/C', launchPackagerScript], procConfig);
+    return execa.sync('cmd.exe', ['/C', launchPackagerScript], {
+      ...procConfig,
+      detached: true,
+      stdio: 'ignore',
+    });
   }
   logger.error(
     `Cannot start the packager. Unknown platform ${process.platform}`,