From eacafc270871625d05800c6c861df5239c992fad Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Sun, 27 Aug 2023 17:05:20 +0400 Subject: Remove default alacritty and add ability to pass args to command --- src/main.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/main.rs b/src/main.rs index bb5133ba..e2c42cba 100644 --- a/src/main.rs +++ b/src/main.rs @@ -29,8 +29,9 @@ use winit::Winit; #[derive(Parser)] #[command(author, version, about, long_about = None)] struct Cli { + /// Command to run upon compositor startup. #[arg(last = true)] - command: Option, + command: Vec, } pub struct LoopData { @@ -98,13 +99,10 @@ fn main() { winit.init(&mut data.niri); } - let res = if let Some(command) = &cli.command { - std::process::Command::new(command).spawn() - } else { - std::process::Command::new("alacritty").spawn() - }; - if let Err(err) = res { - warn!("error spawning command: {err}"); + if let Some((command, args)) = cli.command.split_first() { + if let Err(err) = std::process::Command::new(command).args(args).spawn() { + warn!("error spawning command: {err:?}"); + } } event_loop -- cgit