From bcfb9038871ff696f99411ea71596e7dbfea767e Mon Sep 17 00:00:00 2001
From: DimitarTachev <dimitar.tachev@telerik.com>
Date: Fri, 10 Aug 2018 18:39:26 +0300
Subject: [PATCH] fix: stop showing the command help on native build error

---
 lib/services/android-project-service.ts | 14 ++++++++++----
 lib/services/ios-project-service.ts     | 22 +++++++++++++++-------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts
index c1ea8a4796..6a71bdfb8b 100644
--- a/lib/services/android-project-service.ts
+++ b/lib/services/android-project-service.ts
@@ -701,11 +701,17 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			const childProcessOpts = opts.childProcessOpts || {};
 			childProcessOpts.cwd = childProcessOpts.cwd || projectRoot;
 			childProcessOpts.stdio = childProcessOpts.stdio || "inherit";
+			let commandResult;
+			try {
+				commandResult = await this.spawn(gradlew,
+					gradleArgs,
+					childProcessOpts,
+					spawnFromEventOptions);
+			} catch (err) {
+				this.$errors.failWithoutHelp(err.message);
+			}
 
-			return await this.spawn(gradlew,
-				gradleArgs,
-				childProcessOpts,
-				spawnFromEventOptions);
+			return commandResult;
 		}
 	}
 
diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts
index fd05c066ed..d48ffa805c 100644
--- a/lib/services/ios-project-service.ts
+++ b/lib/services/ios-project-service.ts
@@ -57,7 +57,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		private $plistParser: IPlistParser,
 		private $sysInfo: ISysInfo,
 		private $xCConfigService: XCConfigService) {
-			super($fs, $projectDataService);
+		super($fs, $projectDataService);
 	}
 
 	private _platformsDirCache: string = null;
@@ -442,11 +442,19 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			localArgs.push("-quiet");
 			this.$logger.info("Xcode build...");
 		}
-		return this.$childProcess.spawnFromEvent("xcodebuild",
-			localArgs,
-			"exit",
-			{ stdio: stdio || "inherit", cwd },
-			{ emitOptions: { eventName: constants.BUILD_OUTPUT_EVENT_NAME }, throwError: true });
+
+		let commandResult;
+		try {
+			commandResult = await this.$childProcess.spawnFromEvent("xcodebuild",
+				localArgs,
+				"exit",
+				{ stdio: stdio || "inherit", cwd },
+				{ emitOptions: { eventName: constants.BUILD_OUTPUT_EVENT_NAME }, throwError: true });
+		} catch (err) {
+			this.$errors.failWithoutHelp(err.message);
+		}
+
+		return commandResult;
 	}
 
 	private async setupSigningFromTeam(projectRoot: string, projectData: IProjectData, teamId: string) {
@@ -1112,7 +1120,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 	private async prepareNativeSourceCode(pluginName: string, pluginPlatformsFolderPath: string, projectData: IProjectData): Promise<void> {
 		const project = this.createPbxProj(projectData);
 		const group = this.getRootGroup(pluginName, pluginPlatformsFolderPath);
-		project.addPbxGroup(group.files, group.name, group.path, null, {isMain:true});
+		project.addPbxGroup(group.files, group.name, group.path, null, { isMain: true });
 		project.addToHeaderSearchPaths(group.path);
 		this.savePbxProj(project, projectData);
 	}