Merge remote-tracking branch 'origin/actually-use-version'

2 files changed, 8 insertions, 1 deletions

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(),
     };
diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs
index adb449d..7f428eb 100644
--- a/mumctl/src/main.rs
+++ b/mumctl/src/main.rs
@@ -238,6 +238,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();