From 5d8d9f07669cdc8ac17c866edb6a8c07bbe4221c Mon Sep 17 00:00:00 2001 From: Jonas Maier Date: Mon, 9 Mar 2026 20:49:53 +0100 Subject: variable default value --- src/run/mod.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/run/mod.rs') diff --git a/src/run/mod.rs b/src/run/mod.rs index c7414a8..e041066 100644 --- a/src/run/mod.rs +++ b/src/run/mod.rs @@ -305,7 +305,11 @@ impl Executor { impl parse::Expander for Executor { type Error = ExecError; - fn expand_var(&mut self, var: BString) -> Result { + fn expand_var( + &mut self, + var: BString, + default: Option, + ) -> Result { if var.is_empty() { return Err(ExecError::UnknownVariable(var)); } @@ -331,7 +335,10 @@ impl parse::Expander for Executor { match std::env::var_os(OsStr::from_bytes(&var)) { Some(val) => Ok(val.as_bytes().to_vec()), - None => Err(ExecError::UnknownVariable(var)), + None => match default { + Some(d) => Ok(d), + None => Err(ExecError::UnknownVariable(var)), + }, } } -- cgit v1.2.3