From ee8c69fbc40f130a18da884a1a20140fea745e91 Mon Sep 17 00:00:00 2001 From: quirinecker Date: Mon, 30 Jan 2023 22:23:28 +0100 Subject: [PATCH] removed workaround and is now working without it --- src/app/builder/asciidoctor.rs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/app/builder/asciidoctor.rs b/src/app/builder/asciidoctor.rs index 44053b7..961fa03 100644 --- a/src/app/builder/asciidoctor.rs +++ b/src/app/builder/asciidoctor.rs @@ -30,18 +30,25 @@ fn asciidoctor_docs(in_path: &str, out_path: &str) -> process::Command { } fn asciidoctor_slides(in_path: &str, out_path: &str) -> process::Command { - let mut command = process::Command::new(format!("sh")); - let revealjs_path = path_between(out_path.to_string(), "./dist/slides/revealjs".to_string()); + let mut command = process::Command::new(format!("asciidoctor-revealjs")); + let out_dir = parent_path(out_path); + let revealjs_path = path_between(out_dir.to_string(), "./dist/slides/revealjs".to_string()); command - .arg("asciidoctor-revealjs-sh") .arg(format!("{in_path}")) - .arg(format!("{revealjs_path}")) - .arg(format!("{out_path}")); + .arg(format!("-a")) + .arg(format!("revealjsdir={revealjs_path}")) + .arg(format!("--out-file={out_path}")); return command; } +fn parent_path(child_path: &str) -> String { + let split: Vec<&str> = child_path.split("/").collect(); + let slice = &split[..split.len() - 1]; + return slice.join("/"); +} + pub fn path_between(from: String, to: String) -> String { let from_segments = transform_input_to_clone_split(&from); let to_segments = transform_input_to_clone_split(&to);