From e6befda1460c63cbbfe8a4602f90f75b5544f0ed Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Mon, 9 Jun 2025 19:08:19 +0200
Subject: [PATCH] Use env var for appimagetool

---
 .github/workflows/build_linux.yml | 2 +-
 utils/build_appimage.py           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 1083c082..cbca61c8 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -42,7 +42,7 @@ jobs:
         run: |
           wget https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-$LINUX_ARCH.AppImage
           chmod +x appimagetool-$LINUX_ARCH.AppImage
-          ln -sfv appimagetool-$LINUX_ARCH.AppImage ~/.local/bin/appimagetool
+          export APPIMAGE_TOOL_EXEC="$(pwd)/appimagetool-$LINUX_ARCH.AppImage"
           echo "BUILD_VERSION=$(python pkgutils.py version)" >> $GITHUB_OUTPUT
           python pkgutils.py build-appimage $LINUX_TAG $LINUX_ARCH $PYTHON_VERSION
 
diff --git a/utils/build_appimage.py b/utils/build_appimage.py
index 57b44413..d051f51c 100644
--- a/utils/build_appimage.py
+++ b/utils/build_appimage.py
@@ -114,10 +114,11 @@ def appImage(args: argparse.Namespace) -> None:
     shutil.copyfile(libPath / "libxcb-cursor.so.0", appLibs / "libxcb-cursor.so.0")
 
     # Build Image
+    appToolExec = os.environ.get("APPIMAGE_TOOL_EXEC", "appimagetool")
     env = os.environ.copy()
     env["ARCH"] = mArch
     systemCall([
-        "appimagetool", "--no-appstream", "--updateinformation",
+        appToolExec, "--no-appstream", "--updateinformation",
         f"gh-releases-zsync|vkbo|novelwriter|latest|novelwriter-*-{mArch}.AppImage.zsync",
         str(appDir), bldImg
     ], cwd=bldDir, env=env)