Skip to content

Commit 19e2efb

Browse files
committed
Enable install of v39 but can't test because of filtering, need guidance on how to disable that.
1 parent 29c82ff commit 19e2efb

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

ou_dedetai/assets/LogosStubFailOK.mst

20 KB
Binary file not shown.

ou_dedetai/constants.py

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
# This is relative to this file itself
66
APP_IMAGE_DIR = Path(__file__).parent / "img"
7+
APP_ASSETS_DIR = Path(__file__).parent / "assets"
78

89
# Define app name variables.
910
APP_NAME = 'Ou Dedetai'

ou_dedetai/installer.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,18 @@ def ensure_product_installer_download(app: App):
177177
app=app,
178178
)
179179
# Copy file into install dir.
180-
installer = Path(f"{app.conf.install_dir}/data/{app.conf.faithlife_installer_name}")
180+
installer = Path(f"{app.conf.install_dir}/data/wine64_bottle/drive_c/{app.conf.faithlife_installer_name}")
181181
if not installer.is_file():
182182
shutil.copy(downloaded_file, installer.parent)
183183

184-
logging.debug(f"> '{downloaded_file}' exists?: {Path(downloaded_file).is_file()}") # noqa: E501
184+
# Copy the MST file
185+
mst_source = app.APP_ASSETS_DIR / "wine64_bottle/drive_c/LogosStubFailOK.mst"
186+
mst_destination = Path(app.conf.install_dir) / "data/LogosStubFailOK.mst"
187+
if not mst_destination.is_file():
188+
shutil.copy(mst_source, mst_destination)
185189

190+
logging.debug(f"> '{downloaded_file}' exists?: {Path(downloaded_file).is_file()}") # noqa: E501
191+
logging.debug(f"MST present: {mst_destination.is_file()}")
186192

187193
def ensure_wineprefix_init(app: App):
188194
app.installer_step_count += 1

ou_dedetai/wine.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,14 @@ def install_msi(app: App):
273273
app.status(f"Running MSI installer: {app.conf.faithlife_installer_name}.")
274274
# Execute the .MSI
275275
wine_exe = app.conf.wine64_binary
276-
exe_args = ["/i", f"{app.conf.install_dir}/data/{app.conf.faithlife_installer_name}"] #noqa: E501
276+
exe_args = ["/i", f"{app.conf.install_dir}/data/wine64_bottle/drive_c/{app.conf.faithlife_installer_name}"] #noqa: E501
277277
if app.conf._overrides.faithlife_install_passive is True:
278278
exe_args.append('/passive')
279+
280+
# Add mst if needed
281+
if release_version is not None and utils.check_logos_release_version(release_version, 39, 1):
282+
exe_args.append(f'TRANSFORMS="{app.conf.install_dir}/data/wine64_bottle/drive_c/LogosStubFailOK.mst"')
283+
279284
logging.info(f"Running: {wine_exe} msiexec {' '.join(exe_args)}")
280285
process = run_wine_proc(wine_exe, app, exe="msiexec", exe_args=exe_args)
281286
return process

0 commit comments

Comments
 (0)