Merge pull request #799 from cloudflare/avery/exit-codes

Handle failed exit codes elegantly

src/commands/generate.rs

@@ -3,7 +3,6 @@ use std::process::Command;
 
 use crate::commands::validate_worker_name;
 use crate::settings::target::{Manifest, Site, TargetType};
-use crate::terminal::{emoji, message};
 use crate::{commands, install};
 
 pub fn generate(
@@ -36,18 +35,11 @@ pub fn run_generate(name: &str, template: &str) -> Result<(), failure::Error> {
     let command = command(name, binary_path, &args);
     let command_name = format!("{:?}", command);
 
-    commands::run(command, &command_name)?;
-    Ok(())
+    commands::run(command, &command_name)
 }
 
 fn command(name: &str, binary_path: PathBuf, args: &[&str]) -> Command {
-    let msg = format!(
-        "{} Generating a new worker project with name '{}'...",
-        emoji::SHEEP,
-        name
-    );
-
-    message::working(&msg);
+    log::info!("Generating a new worker project with name '{}'", name);
 
     let mut c = if cfg!(target_os = "windows") {
         let mut c = Command::new("cmd");

src/commands/mod.rs

@@ -1,7 +1,5 @@
 use std::process::Command;
 
-use log::info;
-
 pub mod build;
 pub mod config;
 pub mod generate;
@@ -26,19 +24,18 @@ pub use whoami::whoami;
 
 /// Run the given command and return its stdout.
 pub fn run(mut command: Command, command_name: &str) -> Result<(), failure::Error> {
-    info!("Running {:?}", command);
+    log::info!("Running {:?}", command);
 
     let status = command.status()?;
 
-    if status.success() {
-        Ok(())
-    } else {
+    if !status.success() {
         failure::bail!(
-            "failed to execute `{}`: exited with {}",
-            command_name,
-            status
+            "command exited with {}\n`{}`",
+            status,
+            command_name.replace("\"", "")
         )
     }
+    Ok(())
 }
 
 // Ensures that Worker name is valid.