From b0fa7c3bd13ac52ce712711918c8aac8ea317a8c Mon Sep 17 00:00:00 2001 From: Brett Mayson Date: Tue, 3 Dec 2024 15:31:55 +0000 Subject: [PATCH] fix linux build --- bin/src/commands/mod.rs | 4 +++- bin/src/commands/photoshoot/mod.rs | 3 ++- bin/src/controller/profile.rs | 1 - bin/src/lib.rs | 6 ++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bin/src/commands/mod.rs b/bin/src/commands/mod.rs index a804dae3..c85a0619 100644 --- a/bin/src/commands/mod.rs +++ b/bin/src/commands/mod.rs @@ -5,13 +5,15 @@ pub mod dev; pub mod launch; pub mod localization; pub mod new; -pub mod photoshoot; pub mod release; pub mod script; pub mod utils; pub mod value; pub mod wiki; +#[cfg(windows)] +pub mod photoshoot; + /// Adds modules that should apply to: /// - hemtt check /// - hemtt dev diff --git a/bin/src/commands/photoshoot/mod.rs b/bin/src/commands/photoshoot/mod.rs index ec5a57dd..0bbbbc2d 100644 --- a/bin/src/commands/photoshoot/mod.rs +++ b/bin/src/commands/photoshoot/mod.rs @@ -46,7 +46,8 @@ pub fn execute(cmd: &Command) -> Result { if !dialoguer::Confirm::new() .with_prompt("This feature is experimental, are you sure you want to continue?") .interact() - .unwrap() { + .unwrap() + { return Ok(Report::new()); } diff --git a/bin/src/controller/profile.rs b/bin/src/controller/profile.rs index 46a74ba8..be5256a1 100644 --- a/bin/src/controller/profile.rs +++ b/bin/src/controller/profile.rs @@ -6,7 +6,6 @@ use rust_embed::RustEmbed; use crate::{context::Context, error::Error}; -#[cfg(windows)] #[derive(RustEmbed)] #[folder = "dist/profile"] struct Distributables; diff --git a/bin/src/lib.rs b/bin/src/lib.rs index 59f5c2e0..a653c593 100644 --- a/bin/src/lib.rs +++ b/bin/src/lib.rs @@ -59,10 +59,11 @@ enum Commands { #[clap(alias = "ln")] Localization(commands::localization::Command), Script(commands::script::Command), - Photoshoot(commands::photoshoot::Command), Utils(commands::utils::Command), Value(commands::value::Command), Wiki(commands::wiki::Command), + #[cfg(windows)] + Photoshoot(commands::photoshoot::Command), } /// Run the HEMTT CLI @@ -150,10 +151,11 @@ pub fn execute(cli: &Cli) -> Result<(), Error> { Commands::Release(ref cmd) => commands::release::execute(cmd), Commands::Localization(ref cmd) => commands::localization::execute(cmd), Commands::Script(ref cmd) => commands::script::execute(cmd), - Commands::Photoshoot(ref cmd) => commands::photoshoot::execute(cmd), Commands::Utils(ref cmd) => commands::utils::execute(cmd), Commands::Value(ref cmd) => commands::value::execute(cmd), Commands::Wiki(ref cmd) => commands::wiki::execute(cmd), + #[cfg(windows)] + Commands::Photoshoot(ref cmd) => commands::photoshoot::execute(cmd), }; match report {