From 122c351ebafa230f104e0a72e927c3401c8ee0ce Mon Sep 17 00:00:00 2001
From: Casey Rodarmor <casey@rodarmor.com>
Date: Thu, 25 Mar 2021 17:44:18 -0700
Subject: [PATCH] Improve chooser invocation error message (#772)

Since the chooser is invoked via the shell, print out the full shell
command line, instead of just the chooser.
---
 src/config.rs   |  4 +++-
 src/settings.rs | 32 +++++++++++++++++++++-----------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 684fe1b..1eca775 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -571,7 +571,9 @@ impl Config {
       Err(error) => {
         if self.verbosity.loud() {
           eprintln!(
-            "Chooser `{}` invocation failed: {}",
+            "Chooser `{} {} {}` invocation failed: {}",
+            justfile.settings.shell_binary(self),
+            justfile.settings.shell_arguments(self).join(" "),
             chooser.to_string_lossy(),
             error
           );
diff --git a/src/settings.rs b/src/settings.rs
index 44a2082..388a673 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -15,20 +15,30 @@ impl<'src> Settings<'src> {
   }
 
   pub(crate) fn shell_command(&self, config: &Config) -> Command {
+    let mut cmd = Command::new(self.shell_binary(config));
+
+    cmd.args(self.shell_arguments(config));
+
+    cmd
+  }
+
+  pub(crate) fn shell_binary<'a>(&'a self, config: &'a Config) -> &'a str {
     if let (Some(shell), false) = (&self.shell, config.shell_present) {
-      let mut cmd = Command::new(shell.command.cooked.as_ref());
-
-      for argument in &shell.arguments {
-        cmd.arg(argument.cooked.as_ref());
-      }
-
-      cmd
+      shell.command.cooked.as_ref()
     } else {
-      let mut cmd = Command::new(&config.shell);
+      &config.shell
+    }
+  }
 
-      cmd.args(&config.shell_args);
-
-      cmd
+  pub(crate) fn shell_arguments<'a>(&'a self, config: &'a Config) -> Vec<&'a str> {
+    if let (Some(shell), false) = (&self.shell, config.shell_present) {
+      shell
+        .arguments
+        .iter()
+        .map(|argument| argument.cooked.as_ref())
+        .collect()
+    } else {
+      config.shell_args.iter().map(String::as_ref).collect()
     }
   }
 }