From 6d9863c345dfd4d45087fba8a24b6479714e0055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Tue, 15 Jun 2021 14:11:59 +0200
Subject: actually use version-env on mumctl

---
 mumctl/src/main.rs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'mumctl')

diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs
index 5b2bc05..fbeb0cd 100644
--- a/mumctl/src/main.rs
+++ b/mumctl/src/main.rs
@@ -223,6 +223,10 @@ impl fmt::Display for CliError {
 }
 
 fn main() {
+    if std::env::args().any(|s| s.as_str() == "--version" || s.as_str() == "-V") {
+        println!("mumctl {}", env!("VERSION"));
+        return;
+    }
     log::set_logger(&LOGGER)
         .map(|()| log::set_max_level(LevelFilter::Info))
         .unwrap();
-- 
cgit v1.2.1


From 6870000fc212866008e900c100ee8736f2675e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Sat, 19 Jun 2021 19:35:32 +0200
Subject: allow overriding version numbers with MUM_VERSION

---
 mumctl/build.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'mumctl')

diff --git a/mumctl/build.rs b/mumctl/build.rs
index c11146a..8aa498a 100644
--- a/mumctl/build.rs
+++ b/mumctl/build.rs
@@ -1,7 +1,10 @@
 use std::process::Command;
 
 fn main() {
-    let version = match commit_hash().as_deref() {
+    println!("cargo:rerun-if-env-changed=MUM_VERSION");
+
+    let env_version = std::env::var("MUM_VERSION").ok();
+    let version = match env_version.or_else(|| commit_hash()).as_deref() {
         None | Some("") => format!("v{}", env!("CARGO_PKG_VERSION")),
         Some(version) => version.to_string(),
     };
-- 
cgit v1.2.1