diff --git a/Cargo.toml b/Cargo.toml index 9f7de5d..e313312 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,7 +57,7 @@ crossbeam = "0.8.2" rust_xlsxwriter = "0.43.0" which = "4.4.0" -cmd_lib = "1.3.0" +cmd_lib = "1.9.4" tempfile = "3.6.0" path-clean = "1.0.1" diff --git a/src/cmd_fasr/pl_p2m.rs b/src/cmd_fasr/pl_p2m.rs index 5afa764..28fac8c 100644 --- a/src/cmd_fasr/pl_p2m.rs +++ b/src/cmd_fasr/pl_p2m.rs @@ -50,7 +50,6 @@ pub fn execute(args: &ArgMatches) -> anyhow::Result<()> { let curdir = env::current_dir()?; let fasr = env::current_exe().unwrap().display().to_string(); - use_builtin_cmd!(echo, cat); run_cmd!(echo "==> Paths")?; run_cmd!(echo " \"fasr\" = ${fasr}")?; run_cmd!(echo " \"curdir\" = ${curdir}")?; @@ -107,12 +106,14 @@ pub fn execute(args: &ArgMatches) -> anyhow::Result<()> { .iter() .map(|e| e.1.get(1).unwrap().to_string()) .collect(); + let files = infiles.clone(); run_cmd!( - spanr compare --op intersect $[infiles] | + spanr compare --op intersect $[files] | spanr span stdin --op excise -n 10 -o intersect.json )?; + let files = infiles.clone(); run_cmd!( - spanr merge $[infiles] intersect.json -o merge.json + spanr merge $[files] intersect.json -o merge.json )?; } diff --git a/src/cmd_rgr/pl_2rmp.rs b/src/cmd_rgr/pl_2rmp.rs index 7b483a4..e76a834 100644 --- a/src/cmd_rgr/pl_2rmp.rs +++ b/src/cmd_rgr/pl_2rmp.rs @@ -72,8 +72,6 @@ pub fn execute(args: &ArgMatches) -> anyhow::Result<()> { let tempdir = TempDir::new().unwrap(); let tempdir_str = tempdir.path().to_str().unwrap(); - init_builtin_logger(); - use_builtin_cmd!(echo, info, cat); run_cmd!(info "==> Paths")?; run_cmd!(info " \"rgr\" = ${rgr}")?; run_cmd!(info " \"curdir\" = ${curdir}")?;