handle failed steps in hemtt launch

BrettMayson · Jan 25, 2024 · 80dcee0 · 80dcee0
1 parent b415bea
commit 80dcee0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/Cargo.toml b/bin/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hemtt"
 description = "HEMTT - Arma 3 Build Tool"
-version = "1.11.0-rc3"
+version = "1.11.0-rc4"
 edition = "2021"
 license = "GPL-2.0"
 authors = ["Brett Mayson <[email protected]>"]

diff --git a/bin/src/commands/launch/mod.rs b/bin/src/commands/launch/mod.rs
@@ -192,6 +192,10 @@ pub fn execute(matches: &ArgMatches) -> Result<Report, Error> {
 
     report.merge(executor.run()?);
 
+    if report.failed() {
+        return Ok(report);
+    }
+
     let prefix_folder = arma3dir.join(mainprefix);
     if !prefix_folder.exists() {
         std::fs::create_dir_all(&prefix_folder)?;

diff --git a/bin/src/executor.rs b/bin/src/executor.rs
@@ -50,6 +50,7 @@ impl Executor {
     /// The exeuctor will run the `build` phases
     pub fn build(&mut self, write: bool) {
         self.stages.push("pre_build");
+        info!("will write pbo: {}", write);
         if write {
             self.stages.push("build");
             self.stages.push("post_build");

diff --git a/bin/src/modules/sqf.rs b/bin/src/modules/sqf.rs
@@ -86,7 +86,7 @@ impl Module for SQFCompiler {
         for new_report in reports {
             report.merge(new_report);
         }
-        info!("Compiled {} sqf files", counter.load(Ordering::Relaxed));
+        info!("Validated {} sqf files", counter.load(Ordering::Relaxed));
         Ok(report)
     }
 }