Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-04-22 22:33:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

proton: Fix for broken 64-bit-only prefix shipped 20180822

Browse Source
This commit is contained in:
Andrew Eikum 2018-08-23 09:01:32 -05:00
parent 5aed286761
commit 4d127190a6
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
proton
View File

@ -16,7 +16,7 @@ from filelock import FileLock, Timeout
#To enable debug logging, copy "user_settings.sample.py" to "user_settings.py" #To enable debug logging, copy "user_settings.sample.py" to "user_settings.py"
#and edit it if needed. #and edit it if needed.
CURRENT_PREFIX_VERSION="3.7-1" CURRENT_PREFIX_VERSION="3.7-2"
PFX="Proton: " PFX="Proton: "
@ -32,8 +32,15 @@ def log(msg):
def upgrade_pfx(old_ver): def upgrade_pfx(old_ver):
if old_ver == CURRENT_PREFIX_VERSION: if old_ver == CURRENT_PREFIX_VERSION:
return return
log("Upgrading prefix from " + str(old_ver) + " to " + CURRENT_PREFIX_VERSION + " (" + os.environ["STEAM_COMPAT_DATA_PATH"] + ")") log("Upgrading prefix from " + str(old_ver) + " to " + CURRENT_PREFIX_VERSION + " (" + os.environ["STEAM_COMPAT_DATA_PATH"] + ")")
#nothing to do, yet old_proton_ver, old_prefix_ver = old_ver.split('-')
if old_proton_ver == "3.7" and old_prefix_ver == "1":
if not os.path.exists(prefix + "/drive_c/windows/syswow64/kernel32.dll"):
#shipped a busted 64-bit-only installation on 20180822. detect and wipe clean
log("Detected broken 64-bit-only installation, re-creating prefix.")
shutil.rmtree(prefix)
def run_wine(args): def run_wine(args):
subprocess.call(args, env=env, stderr=lfile) subprocess.call(args, env=env, stderr=lfile)
@ -162,10 +169,6 @@ else:
prefix_lock = FileLock(os.environ["STEAM_COMPAT_DATA_PATH"] + "/pfx.lock", timeout=-1) prefix_lock = FileLock(os.environ["STEAM_COMPAT_DATA_PATH"] + "/pfx.lock", timeout=-1)
with prefix_lock: with prefix_lock:
if not os.path.exists(prefix + "/user.reg"):
#copy default prefix into place
mergedirs(basedir + "/dist/share/default_pfx", prefix)
version_file = os.environ["STEAM_COMPAT_DATA_PATH"] + "/version" version_file = os.environ["STEAM_COMPAT_DATA_PATH"] + "/version"
if os.path.exists(version_file): if os.path.exists(version_file):
with open(version_file, "r") as f: with open(version_file, "r") as f:
@ -173,6 +176,10 @@ with prefix_lock:
else: else:
upgrade_pfx(None) upgrade_pfx(None)
if not os.path.exists(prefix + "/user.reg"):
#copy default prefix into place
mergedirs(basedir + "/dist/share/default_pfx", prefix)
with open(version_file, "w") as f: with open(version_file, "w") as f:
f.write(CURRENT_PREFIX_VERSION + "\n") f.write(CURRENT_PREFIX_VERSION + "\n")