From 64b7d41bee244f4a1dca90da081eab1706cad520 Mon Sep 17 00:00:00 2001 From: Fierelier Date: Tue, 30 Mar 2021 01:19:22 +0200 Subject: [PATCH] Use regular expressions for rule-check --- offline-minecraft-launcher.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/offline-minecraft-launcher.py b/offline-minecraft-launcher.py index 5fa28e6..639d9f6 100644 --- a/offline-minecraft-launcher.py +++ b/offline-minecraft-launcher.py @@ -23,6 +23,7 @@ import json import hashlib import platform import urllib.request +import re def download(url,decode = "utf-8"): request = urllib.request.Request(url,headers={"User-Agent":"Mozilla/5.0"}) @@ -118,11 +119,11 @@ def checkRules(ruleList): for rule in ruleList: if "os" in rule: if "name" in rule["os"]: - if rule["os"]["name"] == "osx": rule["os"]["name"] = "macos" - if lv["osName"] != rule["os"]["name"]: continue + rule["os"]["name"] = rule["os"]["name"].replace("osx","macos") + if not re.search(rule["os"]["name"],lv["osName"]): continue if "arch" in rule["os"]: - if lv["jvmArch"] != rule["os"]["arch"]: continue + if not re.search(rule["os"]["arch"],lv["jvmArch"]): continue if "version" in rule["os"]: continue