Merge remote-tracking branch 'upstream/main' into HEAD

.github/workflows/autobuild-main.yml

@@ -1,4 +1,4 @@
-name: Build & release to test-builds repo
+name: Auto-build & release to test-builds repo
 on:
   push:
     branches:
@@ -23,7 +23,7 @@ jobs:
     - name: Run shell tasks
       run: |
         echo "DATE=$(date +%Y%m%d)" >> $GITHUB_ENV
-        find -name LogosLinuxInstaller -type f -exec chmod +x {} \;
+        find -name oudedetai -type f -exec chmod +x {} \;
     - name: Upload release to test repo
       uses: softprops/action-gh-release@v1
       with:

.github/workflows/build-branch.yml

@@ -47,19 +47,17 @@ jobs:
       run: |
         # apt-get install python3-tk
         pip install --upgrade pip
-        pip install -r requirements.txt
-        pip install coverage
-        pip install pyinstaller
+        pip install .[build,test]
 
     - name: Build with pyinstaller
       id: pyinstaller
       run: |
-        pyinstaller LogosLinuxInstaller.spec --clean
-        echo "bin_name=LogosLinuxInstaller" >> $GITHUB_OUTPUT
+        ./scripts/build-binary.sh
+        echo "bin_name=oudedetai" >> $GITHUB_OUTPUT
 
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: LogosLinuxInstaller
-        path: dist/LogosLinuxInstaller
+        name: oudedetai
+        path: dist/oudedetai
         compression-level: 0

.github/workflows/build-release.yml

@@ -29,7 +29,7 @@ jobs:
     - name: download
       uses: actions/download-artifact@v4
       with:
-        name: LogosLinuxInstaller
+        name: oudedetai
     - name: release
       uses: softprops/action-gh-release@v1
       env:

.github/workflows/build-test.yml

@@ -25,8 +25,8 @@ jobs:
         name: ${{ needs.build.outputs.bin_name }}
     - name: Fix file permissions
       run: |
-        find -name LogosLinuxInstaller -type f
-        find -name LogosLinuxInstaller -type f -exec chmod +x {} \;
+        find -name oudedetai -type f
+        find -name oudedetai -type f -exec chmod +x {} \;
     - name: Upload release to test repo
       uses: softprops/action-gh-release@v1
       with:

.gitignore

@@ -7,3 +7,4 @@ env/
 venv/
 .venv/
 .idea/
+*.egg-info

CHANGELOG.md

@@ -1,5 +1,49 @@
 # Changelog
 
+- 4.0.0-beta.2
+	- Fix #171 [N. Marti]
+	- Fix #185 [N. Marti]
+- 4.0.0-beta.1
+	- Migrate .config and logs from `~/.config/Logos_on_Linux` and `~/.local/state/Logos_on_Linux` to `~/.config/FaithLife-Community` and `~/.local/state/FaithLife-Community`
+	- Add Logos State Manager [T. H. Wright, N. Marti]
+	- Numerous bug fixes [N. Marti, ctrlaltf24]
+	- Make config.WINE_EXE dynamic [T. H. Wright]
+	- Add Docker Build File [jimbob88]
+	- Fix numerous TUI issues [T. H. Wright]
+	- Fix #16 [T. H. Wright]
+	- Fix #84 [T. H. Wright]
+	- Fix #106 [T. H. Wright]
+	- Fix #127 [T. H. Wright]
+	- Fix #128 [T. H. Wright]
+	- Fix #142 [T. H. Wright]
+	- Fix #143 [T. H. Wright]
+	- Fix #153 [T. H. Wright]
+	- Fix #157 [T. H. Wright]
+	- Fix #181 [T. H. Wright]
+	- Fix #188 [T. H. Wright]
+- 4.0.0-alpha.14
+	- Fix install routine [N. Marti, T. H. Wright]
+	- Fix #144, #154, #156
+- 4.0.0-alpha.13
+	- Fix #22. [T. Bleher, J. Goodman, N. Marti, S. Freilichtbuenhe, M. Malevic, T. H. Wright]
+	- Fix package installer and TUI app. Also fix #135, #136, #140. [T. H. Wright, N. Marti]
+	- Introduce network.py and system.py
+- 4.0.0-alpha.12
+	- Fix TUI app's installer [T. H. Wright]
+- 4.0.0-alpha.11
+	- Fix #124 [T. H. Wright]
+- 4.0.0-alpha.10
+	- Fix #121 [T. H. Wright]
+	- Prep for Logos 30+ support [N. Marti, T. H. Wright]
+- 4.0.0-alpha.9
+	- Fix #42 [T. H. Wright]
+	- Fix #76, #104, #111, #115 [T. H. Wright]
+- 4.0.0-alpha.8
+	- Fix #1 [T. H. Wright, N. Marti, T. Bleher, C. Reeder]
+	- Fix #102 [T. H. Wright]
+	- Fix #110 [N. Marti]
+- 4.0.0-alpha.7
+	- Various fixes [N. Marti]
 - 4.0.0-alpha.6
 	- Hotfix to get correct LOGOS_EXE value after installation [N. Marti]
 - 4.0.0-alpha.5

Dockerfile

@@ -0,0 +1,31 @@
+# syntax=docker.io/docker/dockerfile:1.7-labs
+
+FROM ubuntu:focal
+
+# Prevent popups during install of requirements
+ENV DEBIAN_FRONTEND=noninteractive
+
+# App Requirements
+RUN apt update -qq && apt install -y -qq git build-essential gdb lcov pkg-config \
+    libbz2-dev libffi-dev libgdbm-dev libgdbm-compat-dev liblzma-dev \
+    libncurses5-dev libreadline6-dev libsqlite3-dev libssl-dev \
+    lzma lzma-dev python3-tk tk-dev uuid-dev zlib1g-dev && rm -rf /var/lib/apt/lists/*
+
+# pyenv for guaranteed py 3.12
+ENV HOME="/root"
+WORKDIR ${HOME}
+RUN apt update && apt install -y curl && rm -rf /var/lib/apt/lists/*
+RUN curl https://pyenv.run | bash
+ENV PYENV_ROOT="${HOME}/.pyenv"
+ENV PATH="${PYENV_ROOT}/shims:${PYENV_ROOT}/bin:${PATH}"
+
+# Ensure tkinter
+ENV PYTHON_CONFIGURE_OPTS "--enable-shared"
+
+# install py 3.12
+ENV PYTHON_VERSION=3.12.6
+RUN pyenv install --verbose ${PYTHON_VERSION}
+RUN pyenv global ${PYTHON_VERSION}
+
+WORKDIR /usr/src/app
+ENTRYPOINT ["sh", "-c", "pip install --no-cache-dir .[build] && pyinstaller ou_dedetai.spec"]