Enable install of v39 but can't test because of filtering, need guida…

…nce on how to disable that.
FaithLife-Community · Jan 20, 2025 · 19e2efb · 19e2efb
1 parent 29c82ff
commit 19e2efb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/ou_dedetai/assets/LogosStubFailOK.mst b/ou_dedetai/assets/LogosStubFailOK.mst
diff --git a/ou_dedetai/constants.py b/ou_dedetai/constants.py
@@ -4,6 +4,7 @@
 
 # This is relative to this file itself
 APP_IMAGE_DIR = Path(__file__).parent / "img"
+APP_ASSETS_DIR = Path(__file__).parent / "assets"
 
 # Define app name variables.
 APP_NAME = 'Ou Dedetai'

diff --git a/ou_dedetai/installer.py b/ou_dedetai/installer.py
@@ -177,12 +177,18 @@ def ensure_product_installer_download(app: App):
         app=app,
     )
     # Copy file into install dir.
-    installer = Path(f"{app.conf.install_dir}/data/{app.conf.faithlife_installer_name}")
+    installer = Path(f"{app.conf.install_dir}/data/wine64_bottle/drive_c/{app.conf.faithlife_installer_name}")
     if not installer.is_file():
         shutil.copy(downloaded_file, installer.parent)
 
-    logging.debug(f"> '{downloaded_file}' exists?: {Path(downloaded_file).is_file()}")  # noqa: E501
+    # Copy the MST file
+    mst_source = app.APP_ASSETS_DIR / "wine64_bottle/drive_c/LogosStubFailOK.mst"
+    mst_destination = Path(app.conf.install_dir) / "data/LogosStubFailOK.mst"
+    if not mst_destination.is_file():
+        shutil.copy(mst_source, mst_destination)
 
+    logging.debug(f"> '{downloaded_file}' exists?: {Path(downloaded_file).is_file()}")  # noqa: E501
+    logging.debug(f"MST present: {mst_destination.is_file()}")
 
 def ensure_wineprefix_init(app: App):
     app.installer_step_count += 1

diff --git a/ou_dedetai/wine.py b/ou_dedetai/wine.py
@@ -273,9 +273,14 @@ def install_msi(app: App):
     app.status(f"Running MSI installer: {app.conf.faithlife_installer_name}.")
     # Execute the .MSI
     wine_exe = app.conf.wine64_binary
-    exe_args = ["/i", f"{app.conf.install_dir}/data/{app.conf.faithlife_installer_name}"] #noqa: E501
+    exe_args = ["/i", f"{app.conf.install_dir}/data/wine64_bottle/drive_c/{app.conf.faithlife_installer_name}"] #noqa: E501
     if app.conf._overrides.faithlife_install_passive is True:
         exe_args.append('/passive')
+
+    # Add mst if needed
+    if release_version is not None and utils.check_logos_release_version(release_version, 39, 1):
+        exe_args.append(f'TRANSFORMS="{app.conf.install_dir}/data/wine64_bottle/drive_c/LogosStubFailOK.mst"')
+
     logging.info(f"Running: {wine_exe} msiexec {' '.join(exe_args)}")
     process = run_wine_proc(wine_exe, app, exe="msiexec", exe_args=exe_args)
     return process