Skip to content

Commit f20fc23

Browse files
committed
Correct the script to look inside nested jar for binaries
1 parent a0629e4 commit f20fc23

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

.github/scripts/sign-osx-distro-file.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ function signExecutableInsideJar() {
5151
}
5252

5353
function signExecutableInsideJar2() {
54+
local pwd=`pwd`
5455
for f in `find $1 -type f | grep -E $2`
5556
do
5657
echo "Looking for '$3' files inside ${f} to sign..."
@@ -73,9 +74,11 @@ function signExecutableInsideJar2() {
7374
echo "Signing binary file: ${f}"
7475
codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $f
7576
done
77+
cd $pwd
7678
}
7779

7880
function signExecutableInsideNestedJar() {
81+
local pwd=`pwd`
7982
for f in `find $1 -type f | grep -E $2`
8083
do
8184
f_name="$(basename -- $f)"
@@ -85,12 +88,14 @@ function signExecutableInsideNestedJar() {
8588
echo "Extracting archive ${f}"
8689
unzip -q $f -d ./${extracted_jar_dir}
8790
signExecutableInsideJar2 $extracted_jar_dir $3 $4 $5
91+
cd $extracted_jar_dir
8892
zip -r -u ../$f .
8993
cd ..
9094
rm -rf $extracted_jar_dir
9195
echo "Signing binary file: ${f}"
9296
codesign --verbose --deep --force --timestamp --entitlements "${entitlements}" --options=runtime --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" $f
9397
done
98+
cd $pwd
9499
}
95100

96101
# sign libjansi.jnilib inside kotlin-compiler-embeddable.jar
@@ -122,7 +127,7 @@ signExecutableInsideJar2 ${dir}/${destination_folder_name}/SpringToolSuite4.app
122127
signExecutableInsideJar2 ${dir}/${destination_folder_name}/SpringToolSuite4.app ".*/snappy-java.*\.jar$" "libsnappyjava.jnilib" ".*/libsnappyjava\.(jni|dy)lib$"
123128

124129
# sign libjnidispatch.jnilib inside jna.jar
125-
signExecutableInsideJar ".*/jna-\d+.*\.jar$" "libjnidispatch.jnilib.jnilib" ".*/libjnidispatch\.jnilib$"
130+
signExecutableInsideJar2 ${dir}/${destination_folder_name}/SpringToolSuite4.app ".*/jna-\d+.*\.jar$" "libjnidispatch.jnilib.jnilib" ".*/libjnidispatch\.jnilib$"
126131

127132
#sign libjnidispatch.jnilib inside jna.jar which is inside org.springframework.ide.eclipse.docker.client.jar bundle
128133
signExecutableInsideNestedJar ${dir}/${destination_folder_name}/SpringToolSuite4.app ".*/org.springframework.ide.eclipse.docker.client.*\.jar$" ".*/jna-\d+.*\.jar$" "libjnidispatch.jnilib" ".*/libjnidispatch\.jnilib$"

0 commit comments

Comments
 (0)