Fix saving public key when building

Author: huntfx

.github/workflows/build-executable.yml

@@ -233,6 +233,14 @@ jobs:
           pyivf-make_version --outfile "build/version-installer.rc" --version "${{ env.VERSION }}" --file-description "MouseTracks ${{ env.VERSION }}" --internal-name "MouseTracks" --legal-copyright "Peter Hunt" --original-filename "${{ env.FULL_INSTALLER_NAME }}" --product-name "MouseTracks ${{ env.VERSION }}"
           deactivate
 
+      - name: Write public key
+        if: runner.os == 'Windows'
+        shell: bash
+        run: |
+          source .venv/Scripts/activate
+          python launch.py --write-public-key
+          deactivate
+
       - name: Build executable
         shell: bash
         run: |
@@ -252,7 +260,6 @@ jobs:
         run: |
           source .venv/Scripts/activate
           echo -n "$PRIVATE_SIGNING_KEY" > keys/private.key
-          python launch.py --dump-public-key
           python launch.py --sign-executable "dist/MouseTracks.exe"
           python launch.py --sign-executable "dist/${FULL_EXE_NAME}"
           rm keys/private.key

build-nuitka.bat

@@ -75,7 +75,7 @@ if errorlevel 1 (
 )
 
 :: Sign the executables
-python launch.py --dump-public-key
+python launch.py --write-public-key
 python launch.py --sign-executable "dist/MouseTracks.exe"
 python launch.py --sign-executable "dist/MouseTracks-%VERSION%-windows-x64.exe"
 

build-pyinstaller.bat

@@ -35,11 +35,13 @@ mkdir build
 pyivf-make_version --outfile "build/version.rc" --version %VERSION% --file-description "MouseTracks %VERSION%" --internal-name "MouseTracks"  --original-filename "MouseTracks-%VERSION%-windows-x64.exe" --product-name "MouseTracks %VERSION%" --legal-copyright "Peter Hunt" --company-name "Peter Hunt"
 pyivf-make_version --outfile "build/version-installer.rc" --version %VERSION% --file-description "MouseTracks %VERSION%" --internal-name "MouseTracks"  --original-filename "MouseTracks.exe" --product-name "MouseTracks %VERSION%" --legal-copyright "Peter Hunt" --company-name "Peter Hunt"
 
-:: Build the executable
+:: Write out the public key
+python launch.py --write-public-key
+
+:: Build the executable and launcher
 pyinstaller MouseTracks.spec
 
 :: Sign the executables
-python launch.py --dump-public-key
 python launch.py --sign-executable "dist/MouseTracks.exe"
 python launch.py --sign-executable "dist/MouseTracks-%VERSION%-windows-x64.exe"
 

mousetracks2/cli.py

@@ -55,7 +55,7 @@ def parse_args(strict: bool = False) -> argparse.Namespace:
     privacy_group.add_argument('--no-network', action='store_true', help='disable network tracking')
 
     parser.add_argument('--generate-keys', action='store_true', help=argparse.SUPPRESS)
-    parser.add_argument('--dump-public-key', action='store_true', help=argparse.SUPPRESS)
+    parser.add_argument('--write-public-key', action='store_true', help=argparse.SUPPRESS)
     parser.add_argument('--show-public-key', action='store_true', help=argparse.SUPPRESS)
     parser.add_argument('--sign-executable', metavar='PATH', help=argparse.SUPPRESS)
     parser.add_argument('--verify-executable', metavar='PATH', help=argparse.SUPPRESS)
@@ -342,7 +342,7 @@ def run_cli_function() -> bool:
             from .sign import generate_keys
             generate_keys()
 
-        case argparse.Namespace(dump_public_key=True) if sys.platform == 'win32':
+        case argparse.Namespace(write_public_key=True) if sys.platform == 'win32':
             from .sign import write_public_key_to_py
             write_public_key_to_py()
 

mousetracks2/sign.py

@@ -22,7 +22,7 @@
 
 PRIVATE_KEY_PATH = KEY_PATH / 'private.key'
 
-PYTHON_KEY_PATH = Path('.').parent / '_sign.py'
+PYTHON_KEY_PATH = Path(__file__).parent / '_sign.py'
 
 PUBLIC_KEY_SIZE = 32