From 588465477e702bfda9bb4470a6eb0d69f45388d4 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Tue, 17 Sep 2024 23:23:57 +0100 Subject: [PATCH] JAL-4418 JAL-4428 CHANNEL=RELEASE has a different path for the jni jars --- utils/osx_signing/sign_and_staple_dmg.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/utils/osx_signing/sign_and_staple_dmg.sh b/utils/osx_signing/sign_and_staple_dmg.sh index d79c04d..e6c5d54 100755 --- a/utils/osx_signing/sign_and_staple_dmg.sh +++ b/utils/osx_signing/sign_and_staple_dmg.sh @@ -471,8 +471,15 @@ if [ "$SIGN" = 1 ]; then CWD=$(pwd) mycommand $DOSIGN mkdir ${TEMPDIR}/jarsign mycommand $DOSIGN cd ${TEMPDIR}/jarsign - - JFILE="${APPPATH}/Contents/Resources/app/alt/libquaqua-8.0.jnilib.jar" + + # for TEST-RELEASE or DEVELOP + JARPATH=alt + # if it is a release build then this happens + if [ -d "${APPPATH}/Contents/Resources/app/release" ]; then + JARPATH=release + fi + + JFILE="${APPPATH}/Contents/Resources/app/${JARPATH}/libquaqua-8.0.jnilib.jar" mycommand $DOSIGN jar xf "$JFILE" FILE="libquaqua.jnilib" @@ -484,7 +491,7 @@ if [ "$SIGN" = 1 ]; then mycommand $DOSIGN rm "${JFILE}.old" - JFILE="${APPPATH}/Contents/Resources/app/alt/libquaqua64-8.0.jnilib.jar" + JFILE="${APPPATH}/Contents/Resources/app/${JARPATH}/libquaqua64-8.0.jnilib.jar" mycommand $DOSIGN jar xf "$JFILE" FILE="libquaqua64.jnilib" -- 1.7.10.2