fix pyinstaller

pyinstaller fixes such as
- icon not bundled together
- script kept on looping

Author: daveberrys

build.spec

@@ -16,6 +16,7 @@ a = Analysis(
   ['main.py'],
   pathex=[],
   binaries=[],
+  datas=[('icon', 'icon')],
   hookspath=[],
   hooksconfig={},
   runtime_hooks=[],
@@ -49,4 +50,4 @@ exe = EXE(
   codesign_identity=None,
   entitlements_file=None,
   icon=icon_file,
-)
+)

src/initialize.py

@@ -2,10 +2,10 @@
 import shutil
 import subprocess
 import sys
-
 from pathlib import Path
 import src.print as print
 
+SOURCE_ROOT = Path(__file__).resolve().parent.parent
 class Initialize:
     def __init__(
         self,
@@ -23,14 +23,32 @@ def __init__(
         self.packageManager = packageManager
         self.qtorgtk = qtorgtk
 
+    def getPythonExecutable(self):
+        if not getattr(sys, "frozen", False):
+            return sys.executable
+
+        for candidate in ("python3", "python"):
+            pythonExecutable = shutil.which(candidate)
+            if pythonExecutable:
+                return pythonExecutable
+
+        raise FileNotFoundError(
+            "Python executable was not found in PATH. Install Python and try again."
+        )
+
     def fileSystem(self):
         os.makedirs(self.projectName)
         os.makedirs(f"{self.projectName}/icon")
         os.makedirs(f"{self.projectName}/src/backend")
         os.makedirs(f"{self.projectName}/src/frontend")
 
     def copyIcons(self):
-        sourceDir = Path(__file__).resolve().parent.parent / "icon"
+        if getattr(sys, "frozen", False):
+            resourceRoot = os.path.abspath(sys._MEIPASS)
+        else:
+            resourceRoot = str(SOURCE_ROOT)
+
+        sourceDir = Path(resourceRoot) / "icon"
         destinationDir = Path(self.projectName) / "icon"
 
         for iconName in ("512.png", "512.ico", "512.icns"):
@@ -245,7 +263,7 @@ def startWindow(dev):
             with open(f"{self.projectName}/window.py", "w") as f:
                 f.write(windowScript)
 ##########################################################################################
-            
+
 ##################################### GIT IGNORE #################################
             gitIgnore = """# python
 __pycache__
@@ -263,24 +281,28 @@ def startWindow(dev):
 .env"""
             with open(f"{self.projectName}/.gitignore", "w") as f:
                 f.write(gitIgnore)
+
 ##########################################################################################
 
         with open(f"{self.projectName}/requirements.txt", "w") as f:
             for lib in libraries():
                 f.write(f"{lib}\n")
 
         mainScript()
-        subprocess.run([sys.executable, "-m", "venv", "venv"], cwd=self.projectName)
+        pythonExecutable = self.getPythonExecutable()
+        subprocess.run([pythonExecutable, "-m", "venv", "venv"], cwd=self.projectName, check=True)
 
         if sys.platform == "win32":
+            venvPython = ".\\venv\\Scripts\\python"
             subprocess.run(
-                [".\\venv\\Scripts\\pip", "install", "-r", "requirements.txt"],
+                [venvPython, "-m", "pip", "install", "-r", "requirements.txt"],
                 cwd=self.projectName,
                 check=True,
             )
         else:
+            venvPython = "./venv/bin/python"
             subprocess.run(
-                ["./venv/bin/pip", "install", "-r", "requirements.txt"],
+                [venvPython, "-m", "pip", "install", "-r", "requirements.txt"],
                 cwd=self.projectName,
                 check=True,
             )