Stop relying on ${PATH} for wineserver location

Co-authored-by: Shaw Drastin <168159404+showier-drastic@users.noreply.github.com>

Author: hartwork

README.md

@@ -151,6 +151,7 @@ So what is shared with the application by default then?
 - `${PATH}` (with known-unavailable entries removed)
 - `${TERM}`
 - `${USER}`
+- `${wineserver}` (lowercase, with the path to command `wineserver`)
 
 
 **sandwine** features include:

sandwine/_main.py

@@ -552,7 +552,6 @@ def create_bwrap_argv(config):
 
     # Filter ${PATH}
     candidate_paths = os.environ["PATH"].split(os.pathsep)
-    candidate_paths.append("/usr/lib/wine")  # for wineserver on e.g. Debian
     available_paths = []
     for candidate_path in candidate_paths:
         candidate_path = os.path.realpath(candidate_path)
@@ -569,6 +568,7 @@ def create_bwrap_argv(config):
                 ", dropped from ${PATH}."
             )
     env_tasks["PATH"] = os.pathsep.join(available_paths)
+    env_tasks["wineserver"] = which_wineserver()
 
     # Create environment (meaning environment variables)
     argv.add("--clearenv")
@@ -583,7 +583,11 @@ def create_bwrap_argv(config):
 
     # Wrap with wineserver (for clean shutdown, it defaults to 3 seconds timeout)
     if config.with_wine:
-        argv.add("sh", "-c", 'wineserver -p0 && "$0" "$@" ; ret=$? ; wineserver -k ; exit ${ret}')
+        argv.add(
+            "sh",
+            "-c",
+            '"${wineserver}" -p0 && "$0" "$@" ; ret=$? ; "${wineserver}" -k ; exit ${ret}',
+        )
 
     # Add winecfg
     if run_winecfg and config.with_wine:
@@ -598,7 +602,7 @@ def create_bwrap_argv(config):
         # Add Wine
         inner_argv = []
         if config.with_wine:
-            inner_argv.append("wine")
+            inner_argv.append(which_wine())
         inner_argv.append(config.argv_0)
         inner_argv.extend(config.argv_1_plus)
 
@@ -633,14 +637,16 @@ def which_wine() -> str | None:
 
 
 def which_wineserver() -> str | None:
-    extra = [
+    candidates = [
         os.path.dirname(which_wine()),
     ]
 
     if (multiarch := sysconfig.get_config_var("MULTIARCH")) is not None:
-        extra.append(f"/usr/lib/{multiarch}/wine/wineserver")  # e.g. Debian sid and Ubuntu resolute
+        candidates.append(
+            f"/usr/lib/{multiarch}/wine/wineserver"
+        )  # e.g. Debian sid and Ubuntu resolute
 
-    with patch.object(sys, "path", [*sys.path, *extra]):
+    with patch.object(sys, "path", candidates):
         return shutil.which("wineserver")