diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-11-01 10:59:01 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-11-01 14:25:07 +0100 |
| commit | 0ca3c30eb8ee456376ba400592848e1cd0da82c3 (patch) | |
| tree | 51e2ab4f514031ee477c738170662c56054079a8 /mullvad-daemon/src | |
| parent | 01fb1a4cd46c2dcd6c90c23b1ab0bb56a6fe8992 (diff) | |
| download | mullvadvpn-0ca3c30eb8ee456376ba400592848e1cd0da82c3.tar.xz mullvadvpn-0ca3c30eb8ee456376ba400592848e1cd0da82c3.zip | |
Make all binaries use same version format
Diffstat (limited to 'mullvad-daemon/src')
| -rw-r--r-- | mullvad-daemon/src/cli.rs | 2 | ||||
| -rw-r--r-- | mullvad-daemon/src/main.rs | 4 | ||||
| -rw-r--r-- | mullvad-daemon/src/version.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mullvad-daemon/src/cli.rs b/mullvad-daemon/src/cli.rs index d1dcd66a73..017a15a3e9 100644 --- a/mullvad-daemon/src/cli.rs +++ b/mullvad-daemon/src/cli.rs @@ -37,7 +37,7 @@ pub fn get_config() -> Config { fn create_app() -> App<'static, 'static> { let app = App::new(crate_name!()) - .version(version::CURRENT) + .version(version::PRODUCT_VERSION) .author(crate_authors!()) .about(crate_description!()) .arg( diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs index 26a67824ae..7f9771592f 100644 --- a/mullvad-daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs @@ -144,7 +144,7 @@ fn create_daemon(config: &cli::Config) -> Result<Daemon> { log_dir, resource_dir, cache_dir, - version::CURRENT.to_owned(), + version::PRODUCT_VERSION.to_owned(), ) .chain_err(|| "Unable to initialize daemon") } @@ -153,7 +153,7 @@ fn log_version() { info!( "Starting {} - {} {}", env!("CARGO_PKG_NAME"), - version::CURRENT, + version::PRODUCT_VERSION, version::COMMIT_DATE, ) } diff --git a/mullvad-daemon/src/version.rs b/mullvad-daemon/src/version.rs index 2c28c2bba4..f02e2b5fda 100644 --- a/mullvad-daemon/src/version.rs +++ b/mullvad-daemon/src/version.rs @@ -1,5 +1,5 @@ /// A string that identifies the current version of the application -pub const CURRENT: &str = include_str!(concat!(env!("OUT_DIR"), "/product-version.txt")); +pub const PRODUCT_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/product-version.txt")); /// Contains the date of the git commit this was built from pub const COMMIT_DATE: &str = include_str!(concat!(env!("OUT_DIR"), "/git-commit-date.txt")); |