Set WINE_BIN and WINESERVER_BIN env vars

Set `WINE_BIN` and `WINESERVER_BIN` when launching a Protontricks
command. Winetricks uses these to target specific files during the
"binary bitness" check; prior to this Winetricks would attempt to read
the wrapper scripts instead, causing spurious warnings to be printed.

Resolves #383

Author: Matoking

CHANGELOG.md

@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Fixed
  - Fix missing app icons for games installed using newer Steam client
+ - Fix spurious "unknown file arch" Winetricks warnings (newer Winetricks required)
 
 ## [1.12.0] - 2024-09-16
 ### Added

src/protontricks/util.py

@@ -465,6 +465,9 @@ def run_command(
             "Setting WINE environment variable to Proton bundled version."
         )
         wine_environ["WINE"] = str(wine_bin_dir / "wine")
+        wine_environ["WINE_BIN"] = str(
+            proton_app.proton_dist_path / "bin" / "wine"
+        )
 
     wine_environ["WINELOADER"] = wine_environ["WINE"]
 
@@ -474,6 +477,9 @@ def run_command(
             "Setting WINESERVER environment variable to Proton bundled version"
         )
         wine_environ["WINESERVER"] = str(wine_bin_dir / "wineserver")
+        wine_environ["WINESERVER_BIN"] = str(
+            proton_app.proton_dist_path / "bin" / "wineserver"
+        )
 
     temp_dir = Path(tempfile.mkdtemp(prefix="protontricks-"))
     wine_environ["PROTONTRICKS_TEMP_PATH"] = str(temp_dir)

tests/test_util.py

@@ -84,6 +84,13 @@ def test_user_environment_variables_used(
         assert command.env["WINELOADER"] == str(wine_bin_dir / "wine")
         assert command.env["WINESERVER"] == str(wine_bin_dir / "wineserver")
 
+        assert command.env["WINE_BIN"] == str(
+            default_proton.proton_dist_path / "bin" / "wine"
+        )
+        assert command.env["WINESERVER_BIN"] == str(
+            default_proton.proton_dist_path / "bin" / "wineserver"
+        )
+
         monkeypatch.setenv("WINE", "/fake/wine")
         monkeypatch.setenv("WINESERVER", "/fake/wineserver")