Try to make it work on Windows.

justaCasualCoder · Dec 23, 2023 · 24bc086 · 24bc086
1 parent 20e8ddc
commit 24bc086
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/onpush.yml b/.github/workflows/onpush.yml
@@ -24,12 +24,12 @@ jobs:
         python-version: '3.x' # Specify the Python version you need
 
     - name: Install dependencies
-      run: pip install pyinstaller PySide6 beautifulsoup4 requests
+      run: pip install -r requiremnts.txt
     - name: Install Heimdall
-      run: sudo apt install heimdall-flash -y
+      run: sudo apt update && sudo apt install heimdall-flash -y
 
     - name: Build executable
-      run: pyinstaller --onefile --noconsole --add-binary "/bin/heimdall:." --add-data "$(pwd)/python-logo-only.svg:." guiunstable.py && mv dist/guiunstable dist/LinuxGUI && chmod +x dist/LinuxGUI
+      run: pyinstaller --onefile --noconsole --add-binary "/bin/heimdall:heimdall/heimdall_linux" --add-data "$(pwd)/python-logo-only.svg:." guiunstable.py && mv dist/guiunstable dist/LinuxGUI && chmod +x dist/LinuxGUI
       working-directory: ${{ github.workspace }}
 
     - name: Create info file

diff --git a/guiunstable.py b/guiunstable.py
@@ -152,15 +152,15 @@ def start_process(self, partition, image):
             self.p.readyReadStandardError.connect(self.handle_stderr)
             self.p.stateChanged.connect(self.handle_state)
             self.p.finished.connect(self.process_finished)  # Clean up once complete.
-            heimdallbin = os.path.abspath(os.path.join(cwd, "heimdall"))
+            heimdallbin = os.path.abspath(os.path.join(cwd, "heimdall/heimdall_linux"))
             if os.name == 'nt':
                 print("Running on Windows!")
                 print("Running heimdall.exe")
                 heimdallbin = "./heimdall/heimdall.exe"
             else:
                 if os.path.exists(heimdallbin):
                     print("Using Bundled Heimdall")
-                    heimdallbin = "./heimdall"
+                    heimdallbin = "./heimdall/heimdall_linux"
                 else:
                     heimdallbin = "/bin/heimdall"
             command = [f"{heimdallbin}", "flash", f"--{partition}", image]

diff --git a/requiremnts.txt b/requiremnts.txt
@@ -1,3 +1,4 @@
 PySide6
 requests
-BeautifulSoup4
+BeautifulSoup4
+pyinstaller