From 47f314cd197427f2c2f401bf2aaf62b48a16f0dc Mon Sep 17 00:00:00 2001 From: CherretGit Date: Thu, 30 Oct 2025 22:47:05 +0700 Subject: [PATCH] Add zapret binary version --- rust/crates/zaprett/build.rs | 5 +++++ rust/crates/zaprett/src/main.rs | 28 ++++++++++------------------ 2 files changed, 15 insertions(+), 18 deletions(-) create mode 100644 rust/crates/zaprett/build.rs diff --git a/rust/crates/zaprett/build.rs b/rust/crates/zaprett/build.rs new file mode 100644 index 0000000..2726f5f --- /dev/null +++ b/rust/crates/zaprett/build.rs @@ -0,0 +1,5 @@ +use std::env; +fn main() { + let zapret_version = env::var("ZAPRET_VERSION").unwrap_or("unknown".to_string()); + println!("cargo:rustc-env=ZAPRET_VERSION={}", zapret_version); +} diff --git a/rust/crates/zaprett/src/main.rs b/rust/crates/zaprett/src/main.rs index 5b489da..4b994e7 100644 --- a/rust/crates/zaprett/src/main.rs +++ b/rust/crates/zaprett/src/main.rs @@ -1,5 +1,3 @@ -extern crate nix; - use anyhow::bail; use clap::{ArgAction, Parser, Subcommand, builder::BoolishValueParser}; use daemonize::Daemonize; @@ -57,6 +55,9 @@ enum Commands { #[clap(about = "Get module version")] ModuleVer, + + #[clap(about = "Get nfqws binary version")] + BinVer, } #[derive(Serialize, Deserialize)] @@ -114,6 +115,10 @@ async fn main() -> anyhow::Result<()> { module_version(); Ok(()) } + Some(Commands::BinVer) => { + bin_version(); + Ok(()) + } None => { println!("zaprett installed. Join us: t.me/zaprett_module"); Ok(()) @@ -317,22 +322,9 @@ fn module_version() { } } -/*fn bin_version() { - todo!() - /*if let Ok(output) = Command::new("nfqws").arg("--version").output() { - if output.status.success() { - let stdout = String::from_utf8_lossy(&output.stdout); - if let Ok(re) = Regex::new(r"version v[0-9.]+") { - if let Some(m) = re.find(&stdout) { - if let Some(v) = m.as_str().split_whitespace().nth(1) { - println!("{}", v); - return; - } - } - } - } - }*/ -}*/ +fn bin_version() { + println!("{}", env!("ZAPRET_VERSION")); +} fn merge_files( input_paths: Vec, output_path: &Path,