From 0e20388fc96bcf6be2a8b278b78ffad3e0adf742 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 10 Sep 2023 19:51:59 +0200 Subject: [PATCH 1/4] AppImage: update recipe to directory structure of v1 --- dist/AppImageBuilder.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dist/AppImageBuilder.yml b/dist/AppImageBuilder.yml index 226f13e..16c4a3a 100644 --- a/dist/AppImageBuilder.yml +++ b/dist/AppImageBuilder.yml @@ -2,9 +2,11 @@ version: 1 script: - | - icon_path="{{APPIMAGE_PATH}}/usr/share/icons/hicolor/128x128/apps" + cp -rl "{{APPIMAGE_PATH}}" "${TARGET_APPDIR}" + icon_path="${TARGET_APPDIR}/usr/share/icons/hicolor/128x128/apps" mkdir -p "${icon_path}" cp -a dist/evdevhook2.png "${icon_path}" + apt-get update && apt-get install -y --no-install-recommends squashfs-tools AppDir: path: "{{APPIMAGE_PATH}}" @@ -18,7 +20,7 @@ AppDir: exec_args: $@ after_runtime: | - echo "X-AppImage-Integrate=false" >> "{{APPIMAGE_PATH}}/org.v1993.evdevhook2.desktop" + echo "X-AppImage-Integrate=false" >> "${TARGET_APPDIR}/org.v1993.evdevhook2.desktop" apt: arch: From a47dd1a7419642a2d6446c47b8f984edecc7f7ee Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 10 Sep 2023 20:26:25 +0200 Subject: [PATCH 2/4] AppImage: update recipe to appimage-builder:1.1.0 --- .github/workflows/appimage.yml | 2 +- dist/AppImageBuilder.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index fb1f012..9bef9ab 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -47,7 +47,7 @@ jobs: set -eu find build -mindepth 1 -maxdepth 1 -type d | while read -r path; do set -a - APPIMAGE_PATH="${path}" + APPIMAGE_SOURCE="${path}" APPIMAGE_VERSION="${GITHUB_REF_SLUG}" APPIMAGE_APT_ARCH="${TARGET_PLATFORM#*/}" APPIMAGE_APT_DISTRO="${UBUNTU_RELEASE}" diff --git a/dist/AppImageBuilder.yml b/dist/AppImageBuilder.yml index 16c4a3a..42c6c00 100644 --- a/dist/AppImageBuilder.yml +++ b/dist/AppImageBuilder.yml @@ -2,15 +2,13 @@ version: 1 script: - | - cp -rl "{{APPIMAGE_PATH}}" "${TARGET_APPDIR}" + mv "{{APPIMAGE_SOURCE}}" "${TARGET_APPDIR}" icon_path="${TARGET_APPDIR}/usr/share/icons/hicolor/128x128/apps" mkdir -p "${icon_path}" cp -a dist/evdevhook2.png "${icon_path}" apt-get update && apt-get install -y --no-install-recommends squashfs-tools AppDir: - path: "{{APPIMAGE_PATH}}" - app_info: id: org.v1993.evdevhook2 name: evdevhook2 From 84077b4e928e3a5e6441110747e18fc3f2ede0bc Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 10 Sep 2023 20:30:18 +0200 Subject: [PATCH 3/4] AppImage: explain need for mksquashfs --- dist/AppImageBuilder.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/dist/AppImageBuilder.yml b/dist/AppImageBuilder.yml index 42c6c00..df2e23e 100644 --- a/dist/AppImageBuilder.yml +++ b/dist/AppImageBuilder.yml @@ -6,6 +6,7 @@ script: icon_path="${TARGET_APPDIR}/usr/share/icons/hicolor/128x128/apps" mkdir -p "${icon_path}" cp -a dist/evdevhook2.png "${icon_path}" + # mksquashfs is required until fix of https://github.com/AppImageCrafters/build-appimage/issues/5 apt-get update && apt-get install -y --no-install-recommends squashfs-tools AppDir: From b37e6eca65ef2dca2f4ccef781c590e9f1926b3a Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 10 Sep 2023 20:37:38 +0200 Subject: [PATCH 4/4] AppImage: correct explanation for mksquashfs Co-authored-by: Valeri --- dist/AppImageBuilder.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/AppImageBuilder.yml b/dist/AppImageBuilder.yml index df2e23e..57aacb6 100644 --- a/dist/AppImageBuilder.yml +++ b/dist/AppImageBuilder.yml @@ -6,7 +6,7 @@ script: icon_path="${TARGET_APPDIR}/usr/share/icons/hicolor/128x128/apps" mkdir -p "${icon_path}" cp -a dist/evdevhook2.png "${icon_path}" - # mksquashfs is required until fix of https://github.com/AppImageCrafters/build-appimage/issues/5 + # Manual installation is required until fix of https://github.com/AppImageCrafters/build-appimage/issues/5 apt-get update && apt-get install -y --no-install-recommends squashfs-tools AppDir: