From d9461d8b8c8d3c6b44ec9239e6087a1eb6ec6644 Mon Sep 17 00:00:00 2001 From: Kubat <mael.martin31@gmail.com> Date: Sat, 28 Oct 2023 20:01:18 +0200 Subject: [PATCH] BUILD: Try to finx the custom AppRun... --- utils/scripts/docker/package_appimages.bash | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/utils/scripts/docker/package_appimages.bash b/utils/scripts/docker/package_appimages.bash index e4989c3a..3fabeb46 100755 --- a/utils/scripts/docker/package_appimages.bash +++ b/utils/scripts/docker/package_appimages.bash @@ -83,14 +83,21 @@ function deploy() { find ${EXEC^}/usr/lib/ -type f -and \( ${EXCLUDE_LIBS} \) -delete cp LICENSE CHANGELOG.md CONTRIBUTING.md ${EXEC^}/ install -Dm644 ${EXEC}/${EXEC}.appdata.xml ${EXEC^}/usr/share/metainfo/${EXEC}.appdata.xml + unlink ${EXEC^}/AppRun \ + && touch ${EXEC^}/AppRun \ + && chmod +x ${EXEC^}/AppRun cat > ${EXEC^}/AppRun <<EOF #!/usr/bin/env bash set -e this_dir="\$(readlink -f "\$(dirname "\$0")")" -for HOOK in "\$this_dir"/apprun-hooks/*; do - source "\$HOOK" -done -exec "\$this_dir"/AppRun.wrapped "$@" +[ ! -n "\$(find "\$this_dir"/apprun-hooks/ -maxdepth 0 -type d -empty 2>/dev/null)" ] \ + && [ -d "\$this_dir"/apprun-hooks/ ] \ + && { + for HOOK in "\$this_dir"/apprun-hooks/*; do + source "\$HOOK" + done +} +exec "\$this_dir/usr/bin/${EXEC}" "$@" EOF # Pack the AppImage -- GitLab