Merge branch 'main' into ogg

2 files changed, 5 insertions, 2 deletions

diff --git a/mumd/build.rs b/mumd/build.rs
index c11146a..8aa498a 100644
--- a/mumd/build.rs
+++ b/mumd/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/mumd/src/main.rs b/mumd/src/main.rs
index 479c568..e7ac033 100644
--- a/mumd/src/main.rs
+++ b/mumd/src/main.rs
@@ -37,7 +37,7 @@ use tokio_util::codec::{FramedRead, FramedWrite, LengthDelimitedCodec};
 
 #[tokio::main]
 async fn main() {
-    if std::env::args().any(|s| s.as_str() == "--version") {
+    if std::env::args().any(|s| s.as_str() == "--version" || s.as_str() == "-V") {
         println!("mumd {}", env!("VERSION"));
         return;
     }