From 35e0cd907a89b751637f71ce910950a8a8865fe0 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 12 Apr 2024 23:51:09 +0200 Subject: driver: template: rename eval() to eval_sh(), eval_raw() to eval() Make eval() the simple version that doesn't perform any escaping. --- crates/driver/src/driver.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'crates/driver/src/driver.rs') diff --git a/crates/driver/src/driver.rs b/crates/driver/src/driver.rs index 5a00882..28c8578 100644 --- a/crates/driver/src/driver.rs +++ b/crates/driver/src/driver.rs @@ -53,11 +53,9 @@ impl<'ctx> CompletionState<'ctx> { .iter() .map(|Fetch { name, sha256 }| { Ok(Dependency::Fetch { - name: template::ENGINE - .eval_raw(name, &task.args) - .with_context(|| { - format!("Failed to evaluate fetch filename for task {}", task) - })?, + name: template::ENGINE.eval(name, &task.args).with_context(|| { + format!("Failed to evaluate fetch filename for task {}", task) + })?, target_dir: paths::TASK_DLDIR.to_string(), sha256: *sha256, }) @@ -322,7 +320,7 @@ impl<'ctx> Driver<'ctx> { run.push(&task_def.action.run); let command = template::ENGINE - .eval(&run.concat(), &task_ref.args) + .eval_sh(&run.concat(), &task_ref.args) .with_context(|| { format!("Failed to evaluate command template for task {}", task_ref) })?; -- cgit v1.2.3