Merge pull request #143 from owncloud/occ_exit_codes

provide non-zero exit codes on failure
owncloud · Sep 6, 2017 · 6e189cd · 6e189cd
2 parents e0f9bd2 + 16785d7
commit 6e189cd
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 7 deletions.
diff --git a/lib/Command/InstallApp.php b/lib/Command/InstallApp.php
@@ -33,6 +33,9 @@ class InstallApp extends Command {
 	/** @var MarketService */
 	private $marketService;
 
+	/** @var int  */
+	private $exitCode = 0;
+
 	public function __construct(MarketService $marketService) {
 		parent::__construct();
 		$this->marketService = $marketService;
@@ -89,7 +92,8 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 						$output->writeln("$appId: App installed.");
 					}
 				} catch (\Exception $ex) {
-					$output->writeln("$appId: {$ex->getMessage()}");
+					$output->writeln("<error> $appId: {$ex->getMessage()} </error>");
+					$this->exitCode = 1;
 				}
 			}
 		} else {
@@ -110,9 +114,12 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 						$output->writeln("$appId: App installed.");
 					}
 				} catch (\Exception $ex) {
-					$output->writeln("$appId: {$ex->getMessage()}");
+					$output->writeln("<error> $appId: {$ex->getMessage()} </error>");
+					$this->exitCode = 1;
 				}
 			}
 		}
+
+		return $this->exitCode;
 	}
 }
diff --git a/lib/Command/ListApps.php b/lib/Command/ListApps.php
@@ -43,7 +43,12 @@ protected function configure() {
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		$apps = $this->marketService->listApps();
+		try {
+			$apps = $this->marketService->listApps();
+		} catch (\Exception $ex) {
+			$output->writeln("<error>{$ex->getMessage()} </error>");
+			return 1;
+		}
 
 		usort($apps, function ($a, $b) {
 			return strcmp($a['id'], $b['id']);

diff --git a/lib/Command/UnInstallApp.php b/lib/Command/UnInstallApp.php
@@ -33,6 +33,9 @@ class UnInstallApp extends Command {
 	/** @var MarketService */
 	private $marketService;
 
+	/** @var int  */
+	private $exitCode = 0;
+
 	public function __construct(MarketService $marketService) {
 		parent::__construct();
 		$this->marketService = $marketService;
@@ -67,8 +70,10 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 				$this->marketService->uninstallApp($appId);
 				$output->writeln("$appId: App uninstalled.");
 			} catch (\Exception $ex) {
-				$output->writeln("$appId: {$ex->getMessage()}");
+				$output->writeln("<error>$appId: {$ex->getMessage()}</error>");
+				$this->exitCode = 1;
 			}
 		}
+		return $this->exitCode;
 	}
 }
diff --git a/lib/Command/UpgradeApp.php b/lib/Command/UpgradeApp.php
@@ -33,6 +33,9 @@ class UpgradeApp extends Command {
 	/** @var MarketService */
 	private $marketService;
 
+	/** @var int  */
+	private $exitCode = 0;
+
 	public function __construct(MarketService $marketService) {
 		parent::__construct();
 		$this->marketService = $marketService;
@@ -80,10 +83,11 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 						$output->writeln("$appId: Not installed ...");
 					}
 				} catch (\Exception $ex) {
-					$output->writeln("$appId: {$ex->getMessage()}");
+					$output->writeln("<error>$appId: {$ex->getMessage()}</error>");
+					$this->exitCode = 1;
 				}
 			}
-			return;
+			return $this->exitCode;
 		}
 
 		if ($input->getOption('list')) {
@@ -116,8 +120,10 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 					$output->writeln("$appId: Not installed ...");
 				}
 			} catch (\Exception $ex) {
-				$output->writeln("$appId: {$ex->getMessage()}");
+				$output->writeln("<error>$appId: {$ex->getMessage()}</error>");
+				$this->exitCode = 1;
 			}
 		}
+		return $this->exitCode;
 	}
 }