Merge remote-tracking branch 'upstream/main' into merge-main-into-uni…

…ttests

.github/workflows/autobuild-main.yml

@@ -22,12 +22,13 @@ jobs:
         name: ${{ needs.build.outputs.bin_name }}
     - name: Run shell tasks
       run: |
-        echo "DATE=$(date +%Y%m%d)" >> $GITHUB_ENV
         find -name oudedetai -type f -exec chmod +x {} \;
     - name: Upload release to test repo
       uses: softprops/action-gh-release@v1
       with:
-        tag_name: main-${{ env.DATE }}-${{ needs.build.outputs.sha_short }}
+        tag_name: main-latest
+        # target_commitish: ${{ needs.build.outputs.sha }}
+        body: ''
         prerelease: true
         files: ${{ needs.build.outputs.bin_name }}
         repository: FaithLife-Community/test-builds

.github/workflows/build-branch.yml

@@ -9,6 +9,8 @@ on:
       bin_name:
         description: "name of built binary"
         value: ${{ jobs.build.outputs.bin_name }}
+      sha:
+        value: ${{ github.sha }}
       sha_short:
         description: "1st few chars of commit SHA"
         value: ${{ jobs.build.outputs.sha_short }}

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+- 4.0.0-beta.4
+	- Fix #220 [N. Shaaban]
 - 4.0.0-beta.3
 	- Fix various regressions from beta (e.g., #209, #213) [N. Shaaban]
 	- Fix #191 [N. Shaaban]

ou_dedetai/config.py

@@ -80,13 +80,16 @@
 FLPRODUCTi: Optional[str] = None
 INSTALL_STEP: int = 0
 INSTALL_STEPS_COUNT: int = 0
+architecture = None
+bits = None
+ELFPACKAGES = None
 L9PACKAGES = None
 LEGACY_CONFIG_FILES = [
     os.path.expanduser("~/.config/FaithLife-Community/Logos_on_Linux.json"),  # noqa: E501
     os.path.expanduser("~/.config/Logos_on_Linux/Logos_on_Linux.conf")  # noqa: E501
 ]
 LLI_AUTHOR = "Ferion11, John Goodman, T. H. Wright, N. Marti"
-LLI_CURRENT_VERSION = "4.0.0-beta.3"
+LLI_CURRENT_VERSION = "4.0.0-beta.4"
 LLI_LATEST_VERSION: Optional[str] = None
 LLI_TITLE = name_app
 LOG_LEVEL = logging.WARNING

ou_dedetai/installer.py

@@ -784,6 +784,8 @@ def create_desktop_file(name, contents):
     if launcher_path.is_file():
         logging.info(f"Removing desktop launcher at {launcher_path}.")
         launcher_path.unlink()
+    # Ensure the parent directory exists
+    launcher_path.parent.mkdir(parents=True, exist_ok=True)
 
     logging.info(f"Creating desktop launcher at {launcher_path}.")
     with launcher_path.open('w') as f:

ou_dedetai/logos.py

@@ -88,6 +88,8 @@ def run_logos():
         if not good_wine:
             msg.logos_error(reason, app=self)
         else:
+            if reason is not None:
+                logging.debug(f"Warning: Wine Check: {reason}")
             wine.wineserver_kill()
             app = self.app
             if config.DIALOG == 'tk':

ou_dedetai/main.py

@@ -377,6 +377,11 @@ def set_dialog():
             logging.error("Dialog version is outdated. The program will fall back to Curses.")  # noqa: E501
             config.use_python_dialog = False
     logging.debug(f"Use Python Dialog?: {config.use_python_dialog}")
+    # Set Architecture
+
+    config.architecture, config.bits = system.get_architecture()
+    logging.debug(f"Current Architecture: {config.architecture}, {config.bits}bit.")
+    system.check_architecture()
 
 
 def check_incompatibilities():

ou_dedetai/network.py

@@ -14,6 +14,8 @@
 from urllib.parse import urlparse
 from xml.etree import ElementTree as ET
 
+from ou_dedetai import wine
+
 from . import config
 from . import msg
 from . import utils
@@ -468,6 +470,7 @@ def check_for_updates():
         set_logoslinuxinstaller_latest_release_config()
         utils.compare_logos_linux_installer_version()
         set_recommended_appimage_config()
+        wine.enforce_icu_data_files()
 
         config.LAST_UPDATED = now.isoformat()
         utils.write_config(config.CONFIG_FILE)