Check which extension for the project to print out on the run instruc…

…tions for iOS
react-native-community · May 9, 2019 · 876bfe2 · 876bfe2
1 parent e7342d6
commit 876bfe2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/packages/cli/src/commands/init/init.js b/packages/cli/src/commands/init/init.js
@@ -272,7 +272,9 @@ export default (async function initialize(
   try {
     await createProject(projectName, options, version);
 
-    printRunInstructions(process.cwd(), projectName);
+    await execa('rm', ['-rf', 'ios/Lol.xcworkspace']);
+
+    await printRunInstructions(process.cwd(), projectName);
   } catch (e) {
     logger.error(e.message);
     fs.removeSync(projectName);

diff --git a/packages/cli/src/commands/init/printRunInstructions.js b/packages/cli/src/commands/init/printRunInstructions.js
@@ -9,19 +9,22 @@
  */
 
 import path from 'path';
+import fs from 'fs-extra';
 import chalk from 'chalk';
 import {logger} from '@react-native-community/cli-tools';
 
-function printRunInstructions(projectDir: string, projectName: string) {
+async function printRunInstructions(projectDir: string, projectName: string) {
   const absoluteProjectDir = path.resolve(projectDir);
-  const xcodeProjectPath = `${path.resolve(
-    projectDir,
-    'ios',
-    projectName,
-  )}.xcworkspace`;
+  const iosProjectDir = path.resolve(projectDir, 'ios');
+
+  const iosPodsFile = path.resolve(iosProjectDir, `${projectName}.xcworkspace`);
+  const isUsingPods = await fs.pathExists(iosPodsFile);
+
   const relativeXcodeProjectPath = path.relative(
     process.cwd(),
-    xcodeProjectPath,
+    isUsingPods
+      ? iosPodsFile
+      : path.resolve(iosProjectDir, `${projectName}.xcodeproj`),
   );
 
   logger.log(`