From 515d4479a5d6f52ebdee1325c35f1ee5bc53aa4f Mon Sep 17 00:00:00 2001
From: aboyko <alex.boyko@broadcom.com>
Date: Fri, 6 Sep 2024 16:41:58 -0400
Subject: [PATCH] Correct the script to look inside nested jar for binaries

---
 .github/scripts/sign-osx-distro-file.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/scripts/sign-osx-distro-file.sh b/.github/scripts/sign-osx-distro-file.sh
index 4ddd43d32..0ef5d8d99 100755
--- a/.github/scripts/sign-osx-distro-file.sh
+++ b/.github/scripts/sign-osx-distro-file.sh
@@ -29,8 +29,8 @@ function signExecutableInsideJar() {
   for f in `find ${dir}/${destination_folder_name}/SpringToolSuite4.app -type f | grep -E $1`
   do
     echo "Looking for '$2' files inside ${f} to sign..."
-    f_name="$(basename -- $f)"
-    extracted_jar_dir=extracted_${f_name}
+    local f_name="$(basename -- $f)"
+    local extracted_jar_dir=extracted_${f_name}
     rm -rf $extracted_jar_dir
     mkdir $extracted_jar_dir
     echo "Extracting archive ${f}"
@@ -55,8 +55,8 @@ function signExecutableInsideJar2() {
   for f in `find $1 -type f | grep -E $2`
   do
     echo "Looking for '$3' files inside ${f} to sign..."
-    f_name="$(basename -- $f)"
-    extracted_jar_dir=extracted_${f_name}
+    local f_name="$(basename -- $f)"
+    local extracted_jar_dir=extracted_${f_name}
     rm -rf $extracted_jar_dir
     mkdir $extracted_jar_dir
     echo "Extracting archive ${f}"
@@ -81,13 +81,15 @@ function signExecutableInsideNestedJar() {
   local pwd=`pwd`
   for f in `find $1 -type f | grep -E $2`
   do
-    f_name="$(basename -- $f)"
-    extracted_jar_dir=extracted_${f_name}
+    local f_name="$(basename -- $f)"
+    local extracted_jar_dir=extracted_${f_name}
     rm -rf $extracted_jar_dir
     mkdir $extracted_jar_dir
     echo "Extracting archive ${f}"
     unzip -q $f -d ./${extracted_jar_dir}
     signExecutableInsideJar2 $extracted_jar_dir $3 $4 $5
+    pwd
+    ls
     cd $extracted_jar_dir
     zip -r -u ../$f .
     cd ..