diff --git a/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh b/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh index 9be2f2a..6942428 100755 --- a/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh @@ -4,11 +4,11 @@ SCRIPT_DIR=$(cd `dirname "$0"`; pwd) BASE_DIR=`dirname "$SCRIPT_DIR"` # Check if this system have JACK installed -if ! which jackd >/dev/null; then +if ! (which jackd &>/dev/null); then # No JACK, so disable this functionality. # (The bundled libjack won't work correctly anyway). export SYNFIG_DISABLE_JACK=1 - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${BASE_DIR}/lib.extra" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${BASE_DIR}/lib.extra/jack" fi export USER_CONFIG_DIR=$HOME/.config/synfig diff --git a/docker-builder-data/build/script/packet/synfigstudio-appimage.sh b/docker-builder-data/build/script/packet/synfigstudio-appimage.sh index 9feaa99..7f7ed0d 100644 --- a/docker-builder-data/build/script/packet/synfigstudio-appimage.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-appimage.sh @@ -47,7 +47,15 @@ pkinstall_release() { # clean examples rm -rf "$APPDIR/share/synfig/examples" || return 1 - + + # move jack + mkdir -p "$APPDIR/usr/lib.extra/jack" + (cp "$ENVDEPS_RELEASE_PACKET_DIR/lib/libjack"* "$APPDIR/usr/lib.extra/jack" &> /dev/null) \ + || (cp "$ENVDEPS_RELEASE_PACKET_DIR/lib64/libjack"* "$APPDIR/usr/lib.extra/jack" &> /dev/null) + rm -f "$APPDIR/usr/bin/jack"* + rm -f "$APPDIR/usr/lib/libjack"* + rm -f "$APPDIR/usr/lib64/libjack"* + cd "$INSTALL_RELEASE_PACKET_DIR" || return 1 rm -f "$PK_APPDIR_NAME.tar.gz" || return 1 tar -czf "$PK_APPDIR_NAME.tar.gz" "$PK_APPDIR_NAME.AppDir" || return 1