Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix system call failures when running winetricks verbs #115

Merged
merged 2 commits into from
Jun 30, 2024
Merged

Fix system call failures when running winetricks verbs #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e27297
umu_run: remove winetricks environment variables
R1kaB3rN Jun 14, 2024
4adbae7
umu_test: update test
R1kaB3rN Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions umu/umu_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,20 +296,6 @@ def set_env(

# Winetricks
if env.get("EXE", "").endswith("winetricks"):
# Proton directory with the last segment being subdirectory containing
# the Proton libraries and binaries. In upstream Proton 9 the subdir
# is 'files', while in other versions it may be 'dist'.
proton_dist: str = (
f"{env['PROTONPATH']}/files"
if Path(env["PROTONPATH"], "files").is_dir()
else f"{env['PROTONPATH']}/dist"
)

env["WINE"] = f"{proton_dist}/bin/wine"
env["WINELOADER"] = env["WINE"]
env["WINESERVER"] = f"{proton_dist}/bin/wineserver"
env["WINETRICKS_LATEST_VERSION_CHECK"] = "disabled"
env["LD_PRELOAD"] = ""
env["WINETRICKS_SUPER_QUIET"] = (
"" if os.environ.get("UMU_LOG") == "debug" else "1"
)
Expand Down
10 changes: 0 additions & 10 deletions umu/umu_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2091,16 +2091,6 @@ def test_set_env_winetricks(self):
)

# Winetricks
self.assertTrue(self.env["WINE"], "WINE is not set")
self.assertTrue(self.env["WINELOADER"], "WINELOADER is not set")
self.assertTrue(self.env["WINESERVER"], "WINESERVER is not set")
self.assertTrue(
self.env["WINETRICKS_LATEST_VERSION_CHECK"],
"WINETRICKS_LATEST_VERSION_CHECK is not set",
)
self.assertTrue(
self.env["LD_PRELOAD"] == "", "LD_PRELOAD is not set"
)
self.assertTrue(
self.env["WINETRICKS_SUPER_QUIET"],
"WINETRICKS_SUPER_QUIET is not set",
Expand Down