Make the daemon version be the git description

3 files changed, 12 insertions, 7 deletions

diff --git a/mullvad-daemon/src/bin/problem-report.rs b/mullvad-daemon/src/bin/problem-report.rs
index 0365771f14..51c10ca20d 100644
--- a/mullvad-daemon/src/bin/problem-report.rs
+++ b/mullvad-daemon/src/bin/problem-report.rs
@@ -334,10 +334,11 @@ fn collect_metadata() -> HashMap<String, String> {
 }
 
 fn daemon_version() -> String {
-    String::from(include_str!(concat!(
-        env!("OUT_DIR"),
-        "/git-commit-info.txt"
-    )))
+    format!(
+        "{} {}",
+        include_str!(concat!(env!("OUT_DIR"), "/git-commit-desc.txt")),
+        include_str!(concat!(env!("OUT_DIR"), "/git-commit-date.txt"))
+    )
 }
 
 #[cfg(target_os = "linux")]
diff --git a/mullvad-daemon/src/cli.rs b/mullvad-daemon/src/cli.rs
index 676337bcb3..17af99f266 100644
--- a/mullvad-daemon/src/cli.rs
+++ b/mullvad-daemon/src/cli.rs
@@ -33,7 +33,10 @@ pub fn get_config() -> Config {
 
 fn create_app() -> App<'static, 'static> {
     App::new(crate_name!())
-        .version(crate_version!())
+        .version(include_str!(concat!(
+            env!("OUT_DIR"),
+            "/git-commit-desc.txt"
+        )))
         .author(crate_authors!())
         .about(crate_description!())
         .arg(
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 561c0c0b52..4249714d47 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -803,9 +803,10 @@ fn init_logger(log_level: log::LogLevelFilter, log_file: Option<&PathBuf>) -> Re
 
 fn log_version() {
     info!(
-        "Starting {} {}",
+        "Starting {} - {} {}",
         env!("CARGO_PKG_NAME"),
-        include_str!(concat!(env!("OUT_DIR"), "/git-commit-info.txt"))
+        include_str!(concat!(env!("OUT_DIR"), "/git-commit-desc.txt")),
+        include_str!(concat!(env!("OUT_DIR"), "/git-commit-date.txt"))
     )
 }