diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-03-09 16:07:47 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-03-11 12:11:10 +0100 |
| commit | b2c0e7fbfe723942ddd675302d06d66a37ab1bbe (patch) | |
| tree | 0a6b372c102d78d7c684076409346be307b12ac0 | |
| parent | 12e7344fb8eb1d9070895184105a94dc96d4b2b4 (diff) | |
| download | mullvadvpn-b2c0e7fbfe723942ddd675302d06d66a37ab1bbe.tar.xz mullvadvpn-b2c0e7fbfe723942ddd675302d06d66a37ab1bbe.zip | |
Correctly show whether the version is up-to-date in the CLI, depending on the beta program setting
| -rw-r--r-- | mullvad-cli/src/cmds/version.rs | 10 | ||||
| -rw-r--r-- | mullvad-types/src/version.rs | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/mullvad-cli/src/cmds/version.rs b/mullvad-cli/src/cmds/version.rs index ad0df0ad0c..2acde8f76f 100644 --- a/mullvad-cli/src/cmds/version.rs +++ b/mullvad-cli/src/cmds/version.rs @@ -18,7 +18,15 @@ impl Command for Version { println!("Current version: {}", current_version); let version_info = rpc.get_version_info()?; println!("\tIs supported: {}", version_info.current_is_supported); - println!("\tIs up to date: {}", !version_info.current_is_outdated); + + let settings = rpc.get_settings()?; + let is_updated = if settings.get_show_beta_releases().unwrap_or(false) { + version_info.latest == current_version + } else { + version_info.latest_stable == current_version + }; + println!("\tIs up to date: {}", is_updated); + if version_info.latest_stable != version_info.latest { println!( "Latest version: {} (latest stable: {})", diff --git a/mullvad-types/src/version.rs b/mullvad-types/src/version.rs index 21fffca04b..e4023ebb36 100644 --- a/mullvad-types/src/version.rs +++ b/mullvad-types/src/version.rs @@ -17,6 +17,7 @@ pub struct AppVersionInfo { pub current_is_supported: bool, /// True if there is a newer version that contains any functional differences compared to the /// running version. User should upgrade if they want the latest features and bugfixes. + /// DEPRECATED pub current_is_outdated: bool, pub latest_stable: AppVersion, /// Equal to `latest_stable` when the newest release is a stable release. But will contain |