Merge branch 'main' into ogg

5 files changed, 14 insertions, 4 deletions

diff --git a/README.md b/README.md
index 1786c37..c3a7fad 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ publish [compiled binaries on Github](https://github.com/sornas/mum/releases/).
 These are for Arch Linux. You might need other packages on other distributions
 and operating systems, or they might be named something different.
 
-- rust (stable, ideally latest)
+- rust (stable 1.53)
 - alsa-lib
 - openssl
 - opus
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();
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;
     }