address PR feedback

Signed-off-by: Terence Lee <hone02@gmail.com>

Author: hone

Cargo.lock

@@ -28,6 +28,7 @@ log = { workspace = true }
 rustix = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
+shlex = { workspace = true }
 tempfile = { workspace = true }
 tracing = { workspace = true }
 uzers = { workspace = true }

crates/system-reinstall-bootc/Cargo.toml

@@ -1,7 +1,7 @@
 //! The main entrypoint for the bootc system reinstallation CLI
 
-use anyhow::{Context, Result, ensure};
-use bootc_utils::CommandRunExt;
+use anyhow::{ensure, Context, Result};
+use bootc_utils::{CommandRunExt, ResultExt};
 use clap::Parser;
 use fn_error_context::context;
 use rustix::process::getuid;
@@ -52,8 +52,7 @@ impl ReinstallOptsArgs {
                 .iter()
                 .find_map(|path| {
                     os_release::get_bootc_image_from_file(path)
-                        .ok()
-                        .flatten()
+                        .log_err_default()
                         .filter(|s| !s.is_empty())
                 })
                 .ok_or_else(|| {

crates/system-reinstall-bootc/src/main.rs

@@ -17,23 +17,13 @@ fn parse_bootc_image_from_reader<R: BufRead>(reader: R) -> Result<Option<String>
             continue;
         }
 
-        if let Some((key, value)) = line.split_once('=') {
-            if key.trim() == "BOOTC_IMAGE" {
-                let value = value.trim();
-
-                if value.starts_with('"') && value.ends_with('"') && value.len() >= 2 {
-                    let unquoted = &value[1..value.len() - 1];
-                    let processed = unquoted
-                        .replace(r#"\""#, "\"")
-                        .replace(r#"\\"#, "\\")
-                        .replace(r#"\$"#, "$")
-                        .replace(r#"\`"#, "`");
-                    last_found = Some(processed);
-                } else if value.starts_with('\'') && value.ends_with('\'') && value.len() >= 2 {
-                    last_found = Some(value[1..value.len() - 1].to_string());
-                } else {
-                    last_found = Some(value.to_string());
-                }
+        let Some((key, value)) = line.split_once('=') else {
+            continue;
+        };
+
+        if key.trim() == "BOOTC_IMAGE" {
+            if let Some(unquoted) = shlex::split(value).and_then(|mut values| values.pop()) {
+                last_found = Some(unquoted);
             }
         }
     }