Merge branch 'main' into win-test

jdx · Sep 25, 2024 · 500cf1a · 500cf1a
2 parents 07758a2 + 3ac0bf5
commit 500cf1a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/e2e/cli/test_run b/e2e/cli/test_run
@@ -30,3 +30,5 @@ chmod +x .mise/tasks/filetask
 mise r --cd "$PWD" configtask arg1 arg2 ::: filetask arg1 arg2
 assert "cat test-e2e/test-build-output.txt" "TEST_BUILDSCRIPT_ENV_VAR: VALID
 ARGS: arg1 arg2"
+
+assert "mise run test arg1 arg2 arg3" "testing! arg1 arg2 arg3"
diff --git a/src/cli/run.rs b/src/cli/run.rs
@@ -259,7 +259,8 @@ impl Run {
                 }
             } else {
                 for (i, script) in task.run.iter().enumerate() {
-                    let args = match parser.has_any_args_defined() && i == task.run.len() - 1 {
+                    // only pass args to the last script if no formal args are defined
+                    let args = match i == task.run.len() - 1 {
                         true => task.args.iter().cloned().collect_vec(),
                         false => vec![],
                     };

diff --git a/src/task_parser.rs b/src/task_parser.rs
@@ -6,7 +6,7 @@ use std::collections::HashMap;
 use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
 
-#[derive(Default, Clone)]
+#[derive(Debug, Default, Clone)]
 pub struct TaskParseArg {
     i: usize,
     name: String,
@@ -18,7 +18,7 @@ pub struct TaskParseArg {
     // choices: Vec<String>,
 }
 
-#[derive(Default)]
+#[derive(Debug, Default)]
 pub struct TaskParseResults {
     scripts: Vec<String>,
     args: Vec<TaskParseArg>,