summaryrefslogtreecommitdiffhomepage
path: root/mullvad-problem-report/src
diff options
context:
space:
mode:
Diffstat (limited to 'mullvad-problem-report/src')
-rw-r--r--mullvad-problem-report/src/main.rs4
-rw-r--r--mullvad-problem-report/src/metadata.rs4
2 files changed, 3 insertions, 5 deletions
diff --git a/mullvad-problem-report/src/main.rs b/mullvad-problem-report/src/main.rs
index 09d681fd25..85f0143bee 100644
--- a/mullvad-problem-report/src/main.rs
+++ b/mullvad-problem-report/src/main.rs
@@ -1,7 +1,7 @@
#![deny(rust_2018_idioms)]
use clap::{crate_authors, crate_name};
-use mullvad_problem_report::{collect_report, metadata, Error};
+use mullvad_problem_report::{collect_report, Error};
use std::{env, path::Path, process};
use talpid_types::ErrorExt;
@@ -18,7 +18,7 @@ fn main() {
fn run() -> Result<(), Error> {
env_logger::init();
let app = clap::App::new(crate_name!())
- .version(metadata::PRODUCT_VERSION)
+ .version(mullvad_version::VERSION)
.author(crate_authors!())
.about("Mullvad VPN problem report tool. Collects logs and sends them to Mullvad support.")
.setting(clap::AppSettings::SubcommandRequiredElseHelp)
diff --git a/mullvad-problem-report/src/metadata.rs b/mullvad-problem-report/src/metadata.rs
index ac4b8c9255..ab9fe53a91 100644
--- a/mullvad-problem-report/src/metadata.rs
+++ b/mullvad-problem-report/src/metadata.rs
@@ -1,13 +1,11 @@
use std::collections::BTreeMap;
-pub const PRODUCT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/product-version.txt"));
-
pub fn collect() -> BTreeMap<String, String> {
let mut metadata = BTreeMap::new();
metadata.insert("id".to_owned(), uuid::Uuid::new_v4().to_string());
metadata.insert(
"mullvad-product-version".to_owned(),
- PRODUCT_VERSION.to_owned(),
+ mullvad_version::VERSION.to_owned(),
);
metadata.insert("os".to_owned(), talpid_platform_metadata::version());
metadata.extend(talpid_platform_metadata::extra_metadata());