From 47742ac8eedac78ef2367298d0f434533cdf802c Mon Sep 17 00:00:00 2001
From: Timmy Welch <timmy@narnian.us>
Date: Thu, 27 Mar 2025 18:56:38 -0700
Subject: [PATCH] Download appimage for the current platform

---
 build-tools/get_appimage.py | 7 +++++--
 setup.cfg                   | 7 +++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build-tools/get_appimage.py b/build-tools/get_appimage.py
index ebf6f08..4e298b4 100644
--- a/build-tools/get_appimage.py
+++ b/build-tools/get_appimage.py
@@ -3,14 +3,16 @@ from __future__ import annotations
 import argparse
 import os
 import pathlib
+import platform
 
 try:
     import niquests as requests
 except ImportError:
     import requests
 
+arch = platform.machine()
 parser = argparse.ArgumentParser()
-parser.add_argument("APPIMAGETOOL", default="build/appimagetool-x86_64.AppImage", type=pathlib.Path, nargs="?")
+parser.add_argument("APPIMAGETOOL", default=f"build/appimagetool-{arch}.AppImage", type=pathlib.Path, nargs="?")
 
 opts = parser.parse_args()
 opts.APPIMAGETOOL = opts.APPIMAGETOOL.absolute()
@@ -27,7 +29,8 @@ if opts.APPIMAGETOOL.exists():
     raise SystemExit(0)
 
 urlretrieve(
-    "https://github.com/AppImage/appimagetool/releases/latest/download/appimagetool-x86_64.AppImage", opts.APPIMAGETOOL
+    f"https://github.com/AppImage/appimagetool/releases/latest/download/appimagetool-{arch}.AppImage",
+    opts.APPIMAGETOOL,
 )
 os.chmod(opts.APPIMAGETOOL, 0o0700)
 
diff --git a/setup.cfg b/setup.cfg
index ab2a726..cb6fd0d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -257,7 +257,6 @@ deps =
 extras =
     pyinstaller
 commands =
-    pyrcc5 comictaggerlib/graphics/graphics.qrc -o comictaggerlib/graphics/resources.py
     pyinstaller -y build-tools/comictagger.spec
     python -c 'import importlib,platform; importlib.import_module("icu") if platform.system() != "Windows" else ...' # Sanity check for icu
 
@@ -275,11 +274,11 @@ depends =
 deps =
     requests
 allowlist_externals =
-    {tox_root}/build/appimagetool-x86_64.AppImage
+    {tox_root}/build/appimagetool-aarch64.AppImage
 change_dir = {tox_root}/dist/binary
 commands_pre =
     -python -c 'import shutil; shutil.rmtree("{tox_root}/build/", ignore_errors=True)'
-    python {tox_root}/build-tools/get_appimage.py {tox_root}/build/appimagetool-x86_64.AppImage
+    python {tox_root}/build-tools/get_appimage.py {tox_root}/build/appimagetool.AppImage
 commands =
     python -c 'import shutil,pathlib; shutil.copytree("{tox_root}/dist/comictagger/", "{tox_root}/build/appimage", dirs_exist_ok=True); \
     shutil.copy("{tox_root}/comictaggerlib/graphics/app.png", "{tox_root}/build/appimage/app.png"); \
@@ -287,7 +286,7 @@ commands =
     pathlib.Path("{tox_root}/build/appimage/AppRun.desktop").write_text( \
     pathlib.Path("{tox_root}/build-tools/ComicTagger.desktop").read_text() \
     .replace("/usr/local/share/comictagger/app.png", "app"))'
-    {tox_root}/build/appimagetool-x86_64.AppImage {tox_root}/build/appimage
+    {tox_root}/build/appimagetool.AppImage {tox_root}/build/appimage
 
 [testenv:zip_artifacts]
 description = Zip release artifacts