From 14b374697144a68b0a6731250183ec004b2ce085 Mon Sep 17 00:00:00 2001 From: Marcin Kulik Date: Fri, 18 Apr 2025 22:29:26 +0200 Subject: [PATCH] Exclude blank values from query string in stream producer URL --- src/cmd/session.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/cmd/session.rs b/src/cmd/session.rs index 43e7ab7..65638ec 100644 --- a/src/cmd/session.rs +++ b/src/cmd/session.rs @@ -423,18 +423,20 @@ fn build_producer_url( env: &HashMap, ) -> Result { let mut url: Url = url.parse()?; - let term_type = env::var("TERM").ok().unwrap_or_default(); - let shell = env::var("SHELL").ok().unwrap_or_default(); + let mut params = Vec::new(); - let mut params = vec![ - ("term[type]".to_string(), term_type.clone()), - ("shell".to_string(), shell.clone()), - ]; + if let Ok(term_type) = env::var("TERM") { + params.push(("term[type]".to_string(), term_type)); + } if let Some(version) = term_version { params.push(("term[version]".to_string(), version)); } + if let Ok(shell) = env::var("SHELL") { + params.push(("shell".to_string(), shell)); + } + for (k, v) in env { params.push((format!("env[{k}]"), v.to_string())); }