From e958b909dfbcff93fc213bbb04f65e808fe6bd32 Mon Sep 17 00:00:00 2001 From: kakurasan Date: Tue, 1 Mar 2022 21:59:51 +0900 Subject: [PATCH] get_proton_version(): Support new naming scheme of GE-Proton (#297) --- truckersmp_cli/utils.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/truckersmp_cli/utils.py b/truckersmp_cli/utils.py index 1d0d03b7..c5633159 100644 --- a/truckersmp_cli/utils.py +++ b/truckersmp_cli/utils.py @@ -310,6 +310,7 @@ def get_proton_version(protondir): Examples: "xxxxxxxxxx proton-5.13-6" -> (5, 13) "xxxxxxxxxx 6.1-GE-2" -> (6, 1) + "xxxxxxxxxx GE-Proton7-4" -> (7, 0) "xxxxxxxxxx proton-tkg-6.8.r15.gf308782d" -> (6, 8) protondir: Proton top directory that has "version" file @@ -319,6 +320,9 @@ def get_proton_version(protondir): if "proton-tkg" in ver: # 11 = len("proton-tkg") + 1 major, minor = ver[ver.index("proton-tkg") + 11:].split(".")[:2] + elif "GE-Proton" in ver: + # 9 = len("GE-Proton") + major, minor = (ver[ver.index("GE-Proton") + 9:ver.rindex("-")], 0) else: ver = ver.replace("proton-", "") major, minor = ver[ver.index(" ") + 1:ver.index("-")].split(".")