diff --git a/debian/control b/debian/control index 640ba7c..72d1dec 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,8 @@ Depends: cosmic-comp, cosmic-panel, cosmic-bg, - cosmic-applet-host, + cosmic-app-library, + cosmic-launcher, cosmic-applets, cosmic-osd, cosmic-settings-daemon, diff --git a/src/main.rs b/src/main.rs index 14c64aa..0dfe54f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -87,13 +87,13 @@ async fn main() -> Result<()> { .await .expect("failed to start panel"); - let span = info_span!(parent: None, "cosmic-applet-host"); + let span = info_span!(parent: None, "cosmic-app-library"); let stdout_span = span.clone(); let stderr_span = span.clone(); process_manager .start( Process::new() - .with_executable("cosmic-applet-host") + .with_executable("cosmic-app-library") .with_env(env_vars.clone()) .with_on_stdout(move |_, _, line| { let stdout_span = stdout_span.clone(); @@ -111,7 +111,33 @@ async fn main() -> Result<()> { }), ) .await - .expect("failed to start applet host"); + .expect("failed to start app library"); + + let span = info_span!(parent: None, "cosmic-launcher"); + let stdout_span = span.clone(); + let stderr_span = span.clone(); + process_manager + .start( + Process::new() + .with_executable("cosmic-launcher") + .with_env(env_vars.clone()) + .with_on_stdout(move |_, _, line| { + let stdout_span = stdout_span.clone(); + async move { + info!("{}", line); + } + .instrument(stdout_span) + }) + .with_on_stderr(move |_, _, line| { + let stderr_span = stderr_span.clone(); + async move { + warn!("{}", line); + } + .instrument(stderr_span) + }), + ) + .await + .expect("failed to start launcher"); let span = info_span!(parent: None, "cosmic-bg"); let stdout_span = span.clone();