Fix AppImage build

Author: TheAssassin

ci/build-appimage.sh

@@ -45,17 +45,38 @@ AIK_ARCH="$ARCH"
 
 bash "$REPO_ROOT"/ci/build-bundle.sh
 
-mv linuxdeploy-plugin-appimage-bundle AppDir
+mv linuxdeploy-plugin-appimage-bundle AppDir/
+
+# cannot use a simple symlink because the AppRun script in appimagetool does not use bash and cannot use $BASH_SOURCE
+# therefore, a symlink would alter $0, causing the script to detect the wrong path
+# we use a similar script here to avoid this AppImage from depending on bash
+cat > AppDir/usr/bin/appimagetool <<\EOF
+#! /bin/bash
+set -euo pipefail
+
+this_dir="$(readlink -f "$(dirname "$0")")"
+
+# make appimagetool prefer the bundled mksquashfs
+export PATH="$this_dir"/usr/bin:"$PATH"
+
+exec "$this_dir"/../../linuxdeploy-plugin-appimage-bundle/usr/bin/appimagetool "$@"
+
+EOF
+chmod +x AppDir/usr/bin/appimagetool
 
 wget https://github.com/TheAssassin/linuxdeploy/releases/download/continuous/linuxdeploy-"$ARCH".AppImage
 chmod +x linuxdeploy-"$ARCH".AppImage
 
+# qemu is not happy about the AppImage type 2 magic bytes, so we need to "fix" that
+dd if=/dev/zero bs=1 count=3 seek=8 conv=notrunc of=linuxdeploy-"$ARCH".AppImage
+
 export UPD_INFO="gh-releases-zsync|linuxdeploy|linuxdeploy-plugin-appimage|continuous|linuxdeploy-plugin-appimage-$ARCH.AppImage"
 
 # deploy linuxdeploy-plugin-appimage
 ./linuxdeploy-"$ARCH".AppImage --appimage-extract-and-run \
      --appdir AppDir -d "$REPO_ROOT"/resources/linuxdeploy-plugin-appimage.desktop \
     -i "$REPO_ROOT"/resources/linuxdeploy-plugin-appimage.svg
+find AppDir
 
 AppDir/AppRun --appdir AppDir
 

ci/build-in-docker.sh

@@ -38,10 +38,31 @@ uid="$(id -u)"
 # make sure Docker image is up to date
 docker pull --platform "$platform" "$image"
 
+extra_args=()
+[[ -t 0 ]] && extra_args+=("-t")
+
+tmpfile="$(mktemp -t linuxdeploy-plugin-appimage-build-XXXXX.sh)"
+cleanup() {
+    if [[ -f "$tmpfile" ]]; then
+        rm "$tmpfile"
+    fi
+}
+
+cat > "$tmpfile" <<\EOF
+set -euxo pipefail
+
+apt-get update
+apt-get install -y gcc g++ cmake git wget file curl ninja-build
+
+bash -euxo pipefail ci/build-appimage.sh
+EOF
+
+
 docker run \
     --platform "$platform" \
     --rm \
     -i \
+    "${extra_args[@]}" \
     -e ARCH \
     -e GITHUB_ACTIONS \
     -e GITHUB_RUN_NUMBER \
@@ -50,13 +71,6 @@ docker run \
     -v "$PWD":/out \
     -w /out \
     --tmpfs /docker-ramdisk:exec,mode=777 \
+    -v "$tmpfile":/linuxdeploy-plugin-appimage-build.sh:ro \
     "$image" \
-    bash -exo pipefail \
-<<\EOF
-
-apt-get update
-apt-get install -y gcc g++ cmake git wget file curl ninja-build
-
-bash -euxo pipefail ci/build-appimage.sh
-
-EOF
+    bash /linuxdeploy-plugin-appimage-build.sh