1.0.13 (various fixes)

* disable pywebview for linux entirely again
* add functionality to use steam breakpad if sentry is disabled
* possibly fix some libs not being correctly loaded
* dont use cmd, use CreateProcess

Author: mastercoms

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tc2-launcher"
-version = "1.0.12"
+version = "1.0.13"
 description = ""
 authors = [
     {name = "mastercoms",email = "mastercoms@tuta.io"}

tc2_launcher/env.py

@@ -24,9 +24,12 @@
 
 
 def get_host_lib_paths() -> str:
-    """Map host library directories to /run/host/ paths for use inside
+    """Discover host library directories as /run/host/ paths for use inside
     the Sniper container, where the host filesystem is mounted at /run/host/.
-    Deduplicates via realpath (e.g. /usr/lib64 -> /usr/lib on some distros).
+
+    Scans HOST_LIB_DIRS and their immediate subdirectories that contain .so
+    files (catches RUNPATH-resolved private dirs like /usr/lib64/pulseaudio/).
+    Deduplicates via realpath to avoid redundant entries (e.g. /usr/lib64 -> /usr/lib).
     """
     seen: set[str] = set()
     paths: list[str] = []
@@ -38,6 +41,24 @@ def get_host_lib_paths() -> str:
         seen.add(real_dir)
         paths.append("/run/host" + host_dir)
 
+        try:
+            with os.scandir(real_dir) as it:
+                for entry in it:
+                    if not entry.is_dir(follow_symlinks=False):
+                        continue
+                    try:
+                        with os.scandir(entry.path) as sub_it:
+                            if any(
+                                f.name.endswith(".so") or ".so." in f.name
+                                for f in sub_it
+                                if f.is_file(follow_symlinks=False)
+                            ):
+                                paths.append("/run/host" + os.path.join(host_dir, entry.name))
+                    except OSError:
+                        continue
+        except OSError:
+            continue
+
     return os.pathsep.join(paths)
 
 

tc2_launcher/gui.py

@@ -429,7 +429,7 @@ def _start_gui_private(
     current_entry = entry_name
     current_queue = queue
 
-    supported_os = os.name == "nt" or not is_qt_environment()
+    supported_os = os.name == "nt"
     if supported_os:
         width = 800
         height = 600

tc2_launcher/run.py

@@ -577,7 +577,7 @@ def run_non_blocking(
                 cmd,
                 env=new_env,
                 cwd=cwd,
-                shell=True,
+                shell=False,
                 stdin=None,
                 stdout=None,
                 stderr=None,
@@ -670,8 +670,6 @@ def launch_game(
         "-steam",
         "-particles",
         "1",
-        "-nobreakpad",
-        "-nominidumps",
     ]
     default_cmds = ["+ip", "127.0.0.1"]
     if os.name == "posix":
@@ -732,6 +730,10 @@ def launch_game(
     res_opts = ["-w", "-width", "-h", "-height"]
     has_res_opt = any(opt in extra_options_set for opt in res_opts)
 
+    has_nosentry_opt = "-nosentry" in extra_options_set
+    if not has_nosentry_opt:
+        default_args += ["-nobreakpad", "-nominidumps"]
+
     if not has_res_opt and res_w and res_h:
         conf_w = game_settings.get("ScreenWidth")
         conf_h = game_settings.get("ScreenHeight")

tc2_launcher/utils.py

@@ -1,5 +1,5 @@
 import sys
 
-VERSION = (1, 0, 12)
+VERSION = (1, 0, 13)
 VERSION_STR = ".".join(map(str, VERSION))
 DEV_INSTANCE = not getattr(sys, "frozen", False)

version.rc

@@ -6,8 +6,8 @@ VSVersionInfo(
   ffi=FixedFileInfo(
 # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
 # Set not needed items to zero 0.
-filevers=(1, 0, 12, 0),
-prodvers=(1, 0, 12, 0),
+filevers=(1, 0, 13, 0),
+prodvers=(1, 0, 13, 0),
 # Contains a bitmask that specifies the valid bits 'flags'r
 mask=0x0,
 # Contains a bitmask that specifies the Boolean attributes of the file.
@@ -31,12 +31,12 @@ StringFileInfo(
     u'040904B0',
     [StringStruct(u'CompanyName', u'mastercomfig'),
     StringStruct(u'FileDescription', u'TC2 Launcher'),
-    StringStruct(u'FileVersion', u'1.0.12.0'),
+    StringStruct(u'FileVersion', u'1.0.13.0'),
     StringStruct(u'InternalName', u'tc2_launcher'),
     StringStruct(u'LegalCopyright', u'Copyright © mastercomfig'),
     StringStruct(u'OriginalFilename', u'TC2Launcher.exe'),
     StringStruct(u'ProductName', u'TC2 Launcher'),
-    StringStruct(u'ProductVersion', u'1.0.12.0')])
+    StringStruct(u'ProductVersion', u'1.0.13.0')])
   ]), 
 VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]