From 96fddd989eb7a47c52624b428dcbc43a663d7870 Mon Sep 17 00:00:00 2001 From: Jane Haring <52415314+wwxiaoqi@users.noreply.github.com> Date: Thu, 24 Oct 2024 16:14:21 +0800 Subject: [PATCH] :art: Update auto aur PKGBUILD. (#12890) --- .github/workflows/auto_aur_release_stable.yml | 44 ++++++++++++++----- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/.github/workflows/auto_aur_release_stable.yml b/.github/workflows/auto_aur_release_stable.yml index 48d121415..bf92528dd 100644 --- a/.github/workflows/auto_aur_release_stable.yml +++ b/.github/workflows/auto_aur_release_stable.yml @@ -45,27 +45,51 @@ jobs: arch=("x86_64") url="https://b3log.org/siyuan" license=("AGPL-3.0-only") - _pkgname=siyuan-\${pkgver}-linux.AppImage - noextract=(siyuan-\${pkgver}-linux.AppImage) options=("!strip" "!debug") depends=("fuse2") optdepends=('pandoc: docx export') source=("https://github.com/siyuan-note/siyuan/releases/download/v\${pkgver}/siyuan-\${pkgver}-linux.AppImage") sha256sums=('SKIP') - _installdir=/opt/appimages + _pkgname=siyuan-\${pkgver}-linux.AppImage + noextract=("\${_pkgname}") prepare() { - chmod a+x \${_pkgname} - ./\${_pkgname} --appimage-extract >/dev/null - sed -i "s+AppRun+\${_installdir}/siyuan.AppImage+" "squashfs-root/siyuan.desktop" - sed -i "s+^Icon=.*+Icon=siyuan-bin+" "squashfs-root/siyuan.desktop" + chmod +x "\${_pkgname}" + ./"\${_pkgname}" --appimage-extract > /dev/null + } + + build() { + # Adjust .desktop so it will work autside of AppImage container + sed -i \\ + -e "s|Exec=AppRun|Exec=/opt/\${pkgname}/\${pkgname}.AppImage|" \\ + -e "s+^Icon=.*+Icon=siyuan-bin+" \\ + "squashfs-root/siyuan.desktop" + + # Fix permissions; .AppImage permissions are 700 for all directories + chmod -R a-x+rX squashfs-root/usr } package() { - install -Dm755 \${_pkgname} "\${pkgdir}/\${_installdir}/siyuan.AppImage" - install -Dm644 "squashfs-root/resources/stage/icon.png" "\${pkgdir}/usr/share/icons/hicolor/512x512/apps/siyuan-bin.png" - install -Dm644 "squashfs-root/siyuan.desktop" "\${pkgdir}/usr/share/applications/siyuan-bin.desktop" + # AppImage + install -Dm755 "\${srcdir}/\${_pkgname}" "\${pkgdir}/opt/\${pkgname}/\${pkgname}.AppImage" + install -Dm644 "\${srcdir}/squashfs-root/LICENSE" "\${pkgdir}/opt/\${pkgname}/LICENSE" + + # Desktop file + install -Dm644 "\${srcdir}/squashfs-root/siyuan.desktop" \\ + "\${pkgdir}/usr/share/applications/siyuan.desktop" + + # Icon images + install -Dm644 "squashfs-root/resources/stage/icon.png" \\ + "\${pkgdir}/usr/share/icons/hicolor/512x512/apps/siyuan-bin.png" + + # Symlink executable + install -dm755 "\${pkgdir}/usr/bin" + ln -s "/opt/\${pkgname}/\${pkgname}.AppImage" "\${pkgdir}/usr/bin/siyuan" + + # Symlink license + install -dm755 "\${pkgdir}/usr/share/licenses/\${pkgname}/" + ln -s "/opt/\${pkgname}/LICENSE" "\${pkgdir}/usr/share/licenses/\${pkgname}" } EOF