Skip to content

Commit e6befda

Browse files
committed
Use env var for appimagetool
1 parent 910723b commit e6befda

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/build_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: |
4343
wget https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-$LINUX_ARCH.AppImage
4444
chmod +x appimagetool-$LINUX_ARCH.AppImage
45-
ln -sfv appimagetool-$LINUX_ARCH.AppImage ~/.local/bin/appimagetool
45+
export APPIMAGE_TOOL_EXEC="$(pwd)/appimagetool-$LINUX_ARCH.AppImage"
4646
echo "BUILD_VERSION=$(python pkgutils.py version)" >> $GITHUB_OUTPUT
4747
python pkgutils.py build-appimage $LINUX_TAG $LINUX_ARCH $PYTHON_VERSION
4848

utils/build_appimage.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,11 @@ def appImage(args: argparse.Namespace) -> None:
114114
shutil.copyfile(libPath / "libxcb-cursor.so.0", appLibs / "libxcb-cursor.so.0")
115115

116116
# Build Image
117+
appToolExec = os.environ.get("APPIMAGE_TOOL_EXEC", "appimagetool")
117118
env = os.environ.copy()
118119
env["ARCH"] = mArch
119120
systemCall([
120-
"appimagetool", "--no-appstream", "--updateinformation",
121+
appToolExec, "--no-appstream", "--updateinformation",
121122
f"gh-releases-zsync|vkbo|novelwriter|latest|novelwriter-*-{mArch}.AppImage.zsync",
122123
str(appDir), bldImg
123124
], cwd=bldDir, env=env)

0 commit comments

Comments
 (0)