revert ~/.local/share/ULWGL path check. The plan for now is to keep using lutris/runtime/ulwgl/ and just ship ulwgl-run since it auto-extracts and updates ULWGL to the correct path anyways.

This commit is contained in:
GloriousEggroll 2024-02-06 04:11:54 -07:00 committed by Mathieu Comandon
parent ad957da8c2
commit ac96819a10
2 changed files with 3 additions and 3 deletions

View file

@ -153,7 +153,7 @@ def create_prefix( # noqa: C901
# TODO: Determine and insert GAMEID and STORE
wineenv["GAMEID"] = "ulwgl-foo"
wineenv["PROTONPATH"] = settings.RUNNER_DIR
ulwgl_path = os.path.join(os.path.expanduser("~/.local/share"), "ULWGL")
ulwgl_path = os.path.join(os.path.join(settings.RUNTIME_DIR, "ulwgl"))
system.execute([os.path.join(ulwgl_path, "ulwgl-run"), "createprefix"], env=wineenv)
logger.info("%s Prefix created in %s", arch, prefix)
@ -325,7 +325,7 @@ def wineexec( # noqa: C901
baseenv.update(env)
if 'Proton' in wine_path:
ulwgl_path = os.path.join(os.path.expanduser("~/.local/share"), "ULWGL", "ulwgl-run")
ulwgl_path = os.path.join(os.path.join(settings.RUNTIME_DIR, "ulwgl"), "ulwgl-run")
wine_path = ulwgl_path
command_parameters = [wine_path]

View file

@ -1150,7 +1150,7 @@ class wine(Runner):
def get_command(self):
exe = self.get_executable()
ulwgl_path = os.path.join(os.path.expanduser("~/.local/share"), "ULWGL")
ulwgl_path = os.path.join(os.path.join(settings.RUNTIME_DIR, "ulwgl"))
if "Proton" in exe and system.path_exists(ulwgl_path):
return [os.path.join(ulwgl_path, "ulwgl-run")]
return super().get_command()