From f337d6a3ac783619fd5223cd7fb9cde69c87268b Mon Sep 17 00:00:00 2001
From: John Goodman M0RVJ <jg00dman@users.noreply.github.com>
Date: Mon, 20 Jan 2025 15:15:54 +0000
Subject: [PATCH] revert commit - made to wrong branch

---
 ou_dedetai/assets/LogosStubFailOK.mst | Bin 20480 -> 0 bytes
 ou_dedetai/constants.py               |   1 -
 ou_dedetai/installer.py               |  10 ++--------
 ou_dedetai/wine.py                    |   7 +------
 4 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 ou_dedetai/assets/LogosStubFailOK.mst

diff --git a/ou_dedetai/assets/LogosStubFailOK.mst b/ou_dedetai/assets/LogosStubFailOK.mst
deleted file mode 100644
index 4a44a03a65b92a93290a476897c096fcd66b6ccf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20480
zcmeI4%}*0S6u_qi6cM$41V3WPCYo3yTescPZbJh7*fx-W5-`z|VS$A%*0$MQ0z^rO
zk&7oecvjCIjQS7wALzl0;erWAPaaG-NPTa+?J82-nvD_jrhR?WH}7Nno4M@FrtjY!
z-+2D&+$Xl9^|MyCUFl>8Y`YJ1O)OJ@F~4owu2d?v8-p&jeMF!(Z={I;5g-CYfCvx)
zB0vO)01+SpMBx7>@D1)&@&3Ig`{>q{E|mxn0U|&IhyW2F0z`la5CI}U1c(3;a7kc{
zmEdJEj%8U9w9b~A+VJRNZS^yMd>-IIpwo(fTg{TIs_JKQ_4c)wbL+kq__~50(2|3l
zxv$xX{3sRA=yKK8%x8f4efU#bAqcgbSS)?Uc1#Wq3@l^|@?8IG`RbsX=%0PCKIX$`
zBiz<UPN(cN_4<9A*^7TzAM4hdo%XkC&h}_y<7}SYg_mN@{Sd5z8CVgzWigos{o)?k
zg76ebtv2dCT<b$PR}%=qqt<MFkIL55P<@9$9m-$qIMv;)Kd&#1>N^CyX6q)OQ=R7D
z4KJ^Kh`&R?YqoCkIn`<XyW!=v5Ak;hc+J*LKBqdZe>c3m_96Zb0k7G*$>&sWe*NQp
zYwheGbsK!gXZ{a@w1XT1=>Rzlf_L^uK+umG5g-CYfCvx)B0vO)01+SpM1Tko0V1$}
z2#l$-nqjK?xH&&LVrYw_%G4cYRvpz#Wuw7Z-CS05Lv0wea}+iXc4?b%7<?X1&rgGN
zgPgTa(syxeVDf{%vEqkQ=+r|$Yq9#R&~M=Wi+LMPtUDljXTyDwjn$`Lwyx&`FV@=G
zl}m3v3Sbk!^(bf@Uj)I(6%c#|;28*>ZGQm4eU#52*8eAfGwz)PL7xB}1$`3q1Zdo6
z$%DqdmiwS_zvVG#tieHY_?rb51dVl&RX6A^kfEYsDuse#YNaA4E2c837%JFtyvG?g
zI5V$u!=>4h!KJmyg37@}PcLywxm?hutmu#xa|~i~ie}~u+Kk%64G(9kxp42tuBGbG
z$NU_~jl5=X@K(68s`K-Ps&m>8m&B6b!`Ar9mb&i4m<u2`wc>PX!QkroxLYH`Tu==4
zh9bS;L`b+?<%qu(V{p%DsA#H%zOW#Qjcu#ocP}f6VpK@Wd_)dQd^DSocqu2#d{h#1
znRG0Yki^uo2t`6sLF#MPJtBm~L^zt^!zo$dqhd<rrFdNCGx2admx`rhQml6wF2h;}
gPhkFVJy0V8M1Tko0U|&IhyW2F0z`la{7VGB0|k_&SpWb4

diff --git a/ou_dedetai/constants.py b/ou_dedetai/constants.py
index e01b78c7..e23d724a 100644
--- a/ou_dedetai/constants.py
+++ b/ou_dedetai/constants.py
@@ -4,7 +4,6 @@
 
 # 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
index 6be95d99..f36dab5f 100644
--- a/ou_dedetai/installer.py
+++ b/ou_dedetai/installer.py
@@ -177,18 +177,12 @@ def ensure_product_installer_download(app: App):
         app=app,
     )
     # Copy file into install dir.
-    installer = Path(f"{app.conf.install_dir}/data/wine64_bottle/drive_c/{app.conf.faithlife_installer_name}")
+    installer = Path(f"{app.conf.install_dir}/data/{app.conf.faithlife_installer_name}")
     if not installer.is_file():
         shutil.copy(downloaded_file, installer.parent)
 
-    # 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
index 3ea64187..feeaeee9 100644
--- a/ou_dedetai/wine.py
+++ b/ou_dedetai/wine.py
@@ -273,14 +273,9 @@ 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/wine64_bottle/drive_c/{app.conf.faithlife_installer_name}"] #noqa: E501
+    exe_args = ["/i", f"{app.conf.install_dir}/data/{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