From 65e864965ec6e4a08a8e6696f779a5734033b6be Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Fri, 19 Jan 2024 20:46:10 +0400
Subject: Print git version in clap too

---
 src/main.rs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/main.rs b/src/main.rs
index af2346e7..78edd8ea 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -49,7 +49,7 @@ use crate::ipc::client::handle_msg;
 use crate::utils::{cause_panic, REMOVE_ENV_RUST_BACKTRACE, REMOVE_ENV_RUST_LIB_BACKTRACE};
 
 #[derive(Parser)]
-#[command(author, version, about, long_about = None)]
+#[command(author, version = version(), about, long_about = None)]
 #[command(args_conflicts_with_subcommands = true)]
 #[command(subcommand_value_name = "SUBCOMMAND")]
 #[command(subcommand_help_heading = "Subcommands")]
@@ -151,11 +151,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         }
     }
 
-    info!(
-        "starting version {} ({})",
-        env!("CARGO_PKG_VERSION"),
-        git_version!(fallback = "unknown commit"),
-    );
+    info!("starting version {}", &version());
 
     // Load the config.
     let path = cli.config.or_else(default_config_path);
@@ -257,6 +253,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     Ok(())
 }
 
+fn version() -> String {
+    format!(
+        "{} ({})",
+        env!("CARGO_PKG_VERSION"),
+        git_version!(fallback = "unknown commit"),
+    )
+}
+
 fn import_env_to_systemd() {
     let rv = Command::new("/bin/sh")
         .args([
-- 
cgit