From ca62fbcb91fc1a3536501c3e2ff25c20b2245692 Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey.ghost@gmail.com>
Date: Mon, 11 May 2020 06:23:43 +0300
Subject: [PATCH] Fix composer output (fix #402) (#404)

---
 src/steps/generic.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/steps/generic.rs b/src/steps/generic.rs
index 638e0c0c..d725a10d 100644
--- a/src/steps/generic.rs
+++ b/src/steps/generic.rs
@@ -215,8 +215,16 @@ pub fn run_composer_update(ctx: &ExecutionContext) -> Result<()> {
         }
     }
 
-    let output = Command::new(&composer).args(&["global", "update"]).check_output()?;
-    if output.contains("valet") {
+    let output = Command::new(&composer).args(&["global", "update"]).output()?;
+    let status = output.status;
+    if !status.success() {
+        return Err(TopgradeError::ProcessFailed(status).into());
+    }
+    let stdout = String::from_utf8(output.stdout)?;
+    let stderr = String::from_utf8(output.stderr)?;
+    print!("{}\n{}", stdout, stderr);
+
+    if stdout.contains("valet") || stderr.contains("valet") {
         if let Some(valet) = utils::which("valet") {
             ctx.run_type().execute(&valet).arg("install").check_run()?;
         }