diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index a802c7c..2ee2ba3 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -125,8 +125,6 @@ jobs: --upx-binary="${{ env.UPX_BINARY }}" \ --noinclude-qt-translations \ --include-data-files=build_info.json=build_info.json \ - --include-data-files=build_info.json=src/build_info.json \ - --include-data-files=build_info.json=src/core/interface/build_info.json \ --output-filename=${{ env.APP_NAME }}.exe \ --output-dir=nuitka-build \ src/main.py @@ -137,8 +135,6 @@ jobs: run: | pyinstaller --onefile --windowed \ --add-data "build_info.json:." \ - --add-data "build_info.json:src/core" \ - --add-data "build_info.json:src/core/interface" \ --exclude-module PyQt6 \ --exclude-module PyQt5 \ --hidden-import=backports.tarfile \ @@ -155,8 +151,6 @@ jobs: run: | pyinstaller --onefile \ --add-data "build_info.json:." \ - --add-data "build_info.json:src/core" \ - --add-data "build_info.json:src/core/interface" \ --exclude-module PyQt6 \ --exclude-module PyQt5 \ --hidden-import=backports.tarfile \ @@ -287,4 +281,4 @@ jobs: release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-macos release/SHA256SUMS.txt env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/src/build_info.json b/build_info.json similarity index 100% rename from src/build_info.json rename to build_info.json diff --git a/src/core/interface/dialogs/update.py b/src/core/interface/dialogs/update.py index d4b83a1..3896b29 100644 --- a/src/core/interface/dialogs/update.py +++ b/src/core/interface/dialogs/update.py @@ -8,9 +8,9 @@ import platform import json import os -def check_version(): +def get_version(): # Get build info filepath - build_info_path = Path(__file__).resolve().parents[3] / "build_info.json" # parents[3] = climb up 4 directories from the file ran + build_info_path = Path(__file__).resolve().parents[4] / "build_info.json" # parents[4] = climb up 5 directories from the file ran if os.path.exists(build_info_path): with open(build_info_path, "r") as f: build_info = json.load(f) diff --git a/src/core/interface/gui.py b/src/core/interface/gui.py index 743d440..d48f4d3 100644 --- a/src/core/interface/gui.py +++ b/src/core/interface/gui.py @@ -12,8 +12,8 @@ from core.interface.dialogs.settings import settings_dialog from core.interface.assets.base64_icons import logo_base64 from core.interface.dialogs.eventfilter import eventFilter from core.utils.network.download import download_selected -from core.interface.dialogs.update import check_version from core.interface.utils.tabhelper import create_tab +from core.interface.dialogs.update import get_version from core.utils.general.shutdown import closehelper from core.utils.general.wrappers import run_thread from core.interface.dialogs.image import Image @@ -87,7 +87,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget): # Get current version # core.interface.dialogs.update - check_version() + get_version() # Initialize Window self.setWindowTitle("Software Manager")