fix: do not fail if fonts directory does not exist (like on NixOS)

Also adds --print-cmd in debug build, and small fixes

Author: sandorex

src/cli.rs

@@ -10,6 +10,11 @@ pub struct Cli {
     #[arg(long)]
     pub dry_run: bool,
 
+    /// Debug only option to print the parsed options
+    #[cfg(debug_assertions)]
+    #[arg(long)]
+    pub print_cmd: bool,
+
     /// Increase verbosity
     #[arg(short, long, value_name = "Error|Warn|Info|Debug|Trace", default_value_t = log::Level::Warn, env = crate::ENV_LOG_LEVEL)]
     pub log_level: log::Level,
@@ -74,8 +79,6 @@ const START_HEADING_EXPERIMENTAL: &str = "EXPERIMENTAL";
 #[derive(Args, Debug, Clone)]
 pub struct CmdStartArgs {
     /// Enter shell after container initialization finishes
-    ///
-    /// Ignored if stdout is not a terminal (ex. a pipe)
     #[arg(short = 'E', long, env = crate::ENV_ENTER_ON_START)]
     pub enter: bool,
 
@@ -144,7 +147,7 @@ pub struct CmdStartArgs {
     /// Add capabilities, or drop them with by prefixing `!cap`
     ///
     /// For more details about capabilities read `man 7 capabilities`
-    #[arg(long = "cap", value_name = "[!]CAPABILITY", help_heading = START_HEADING_PERMISSIONS)]
+    #[arg(long = "cap", value_name = "[!]CAPABILITY", value_delimiter = ',', help_heading = START_HEADING_PERMISSIONS)]
     pub capabilities: Vec<String>,
 
     /// File, image or config to use to start a container

src/commands/cmd_start/util.rs

@@ -17,7 +17,7 @@ pub fn get_hostname() -> Result<String> {
 
     // then as a fallback use hostname executable
     let cmd = Command::new("hostname")
-        .output()
+        .log_output()
         .with_context(|| "Could not call hostname")?;
 
     let hostname = String::from_utf8_lossy(&cmd.stdout);
@@ -188,8 +188,14 @@ pub fn mount_wayland(ctx: &Context, cli_args: &CmdStartArgs, cmd: &mut Command)
                 ));
             }
 
-            // add fonts just in case
-            cmd.arg("--volume=/usr/share/fonts:/usr/share/fonts/host:ro");
+            // add fonts if they exist
+            let system_fonts = Path::new("/usr/share/fonts");
+            if system_fonts.exists() {
+                cmd.arg(format!(
+                    "--volume={}:/usr/share/fonts/host:ro",
+                    system_fonts.to_string_lossy()
+                ));
+            }
 
             // legacy ~/.fonts
             let home_dot_fonts = ctx.user_home.join(".fonts");
@@ -202,7 +208,6 @@ pub fn mount_wayland(ctx: &Context, cli_args: &CmdStartArgs, cmd: &mut Command)
 
             // font dir ~/.local/share/fonts
             let home_dot_local_fonts = ctx.user_home.join(".local").join("share").join("fonts");
-
             if home_dot_local_fonts.exists() {
                 cmd.arg(format!(
                     "--volume={}:/usr/share/fonts/host_local:ro",

src/main.rs

@@ -40,6 +40,14 @@ fn main() -> Result<()> {
         Context::new(args.dry_run, Box::new(engine::Podman))
     };
 
+    // print parsed options
+    if cfg!(debug_assertions) {
+        if args.print_cmd {
+            dbg!(args);
+            return Ok(());
+        }
+    }
+
     match args.cmd {
         CliCommands::Start(x) => commands::start_container(get_ctx()?, x)?,
         CliCommands::Shell(x) => commands::open_shell(get_ctx()?, x)?,