usvg: Refactor code that runs it in bundles.rs

This provides a place to put additional command line options.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/bundles.rs b/src/bundles.rs
index 41b08d642c2d502f930784ba6d53b2ddd798998c..f9c7f47a65ce2c560cf893a1f2bedb8b7f9b5073 100644 (file)
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -849,9 +849,11 @@ fn make_usvg(instance_name: &str, bundle_name: &str, za: &mut IndexedZip,
       let mut usvg1 = tempfile::tempfile_in(&svg_dir)
         .context("create temporary usvg").map_err(IE::from)?;
 
-      let got = Command::new(&config().usvg_bin).args(&["-","-c"])
+      let mut cmd = Command::new(&config().usvg_bin);
+      cmd.args(&["-","-c"])
         .stdin(input)
-        .stdout(usvg1.try_clone().context("dup usvg1").map_err(IE::from)?)
+        .stdout(usvg1.try_clone().context("dup usvg1").map_err(IE::from)?);
+      let got = cmd
         .output().context("run usvg").map_err(IE::from)?;
       if ! got.status.success() {
         throw!(LE::BadBundle(format!(