summaryrefslogtreecommitdiffhomepage
path: root/mullvad-version
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-05-18 12:52:33 +0200
committerAlbin <albin@mullvad.net>2023-05-18 13:03:13 +0200
commit4e180fad14ff126edbfc891b8a3294bb0df67f66 (patch)
tree38b9dd0fb8ff7b83487ef755ad3f95506cdf1ad3 /mullvad-version
parent77225caa422f632864d941e338285406fe606a00 (diff)
downloadmullvadvpn-4e180fad14ff126edbfc891b8a3294bb0df67f66.tar.xz
mullvadvpn-4e180fad14ff126edbfc891b8a3294bb0df67f66.zip
Fix stable Android version code
Diffstat (limited to 'mullvad-version')
-rw-r--r--mullvad-version/src/main.rs13
1 files changed, 10 insertions, 3 deletions
diff --git a/mullvad-version/src/main.rs b/mullvad-version/src/main.rs
index a54914e6c2..a4892633c9 100644
--- a/mullvad-version/src/main.rs
+++ b/mullvad-version/src/main.rs
@@ -6,6 +6,8 @@ const ANDROID_VERSION: &str =
const VERSION_REGEX: &str = r"^20([0-9]{2})\.([1-9][0-9]?)(-beta([1-9][0-9]?))?(-dev-[0-9a-f]+)?$";
+const ANDROID_STABLE_VERSION_CODE_SUFFIX: &str = "99";
+
fn main() {
let command = env::args().nth(1);
match command.as_deref() {
@@ -41,19 +43,24 @@ fn to_semver(version: &str) -> String {
/// Last two digits of the year (major) ^^
/// Incrementing version (minor) ^^
/// Unused ^^
-/// Beta number, 00 if stable ^^
+/// Beta number, 99 if stable ^^
///
-/// # Example
+/// # Examples
///
/// Version: 2021.34-beta5
/// versionCode: 21340005
+///
+/// Version: 2021.34
+/// versionCode: 21340099
fn to_android_version_code(version: &str) -> String {
let version = parse_version(version);
format!(
"{}{:0>2}00{:0>2}",
version.year,
version.incremental,
- version.beta.unwrap_or_default()
+ version
+ .beta
+ .unwrap_or(ANDROID_STABLE_VERSION_CODE_SUFFIX.to_string())
)
}