From 93d6ab21ca97cadab971a9fcfa9dc5b731a1d3ab Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Fri, 14 Jul 2023 16:44:43 -0400
Subject: [PATCH] GH-Hosted: Fix win exe signing script

---
 .github/scripts/sign-exe-in-zip-file.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/scripts/sign-exe-in-zip-file.sh b/.github/scripts/sign-exe-in-zip-file.sh
index 43f71e440..0155b452b 100755
--- a/.github/scripts/sign-exe-in-zip-file.sh
+++ b/.github/scripts/sign-exe-in-zip-file.sh
@@ -1,3 +1,5 @@
+set -e
+
 file=$1
 filename="$(basename -- $file)"
 
@@ -12,14 +14,12 @@ unzip -q $file -d ./${destination_folder_name}
 echo "Successfully extracted ${filename}"
 sts_folder=`find ./${destination_folder_name} -maxdepth 1 -type d -name 'sts-*' -print -quit`
 echo "Found STS distro folder: ${sts_folder}"
-echo "About to sign win exe file: ./${sts_folder}/SpringToolSuite4.exe"
-${workdir}/.github/scripts/sign-exe.sh ./${sts_folder}/SpringToolSuite4.exe ${sts_folder}/SpringToolSuite4.exe
-
-echo "Contents of ${destination_folder_name}"
-ls ./${destination_folder_name}
-
+echo "About to sign win exe file: ${sts_folder}/SpringToolSuite4.exe"
+${workdir}/.github/scripts/sign-exe.sh ${sts_folder}/SpringToolSuite4.exe ${sts_folder}/SpringToolSuite4.exe
 echo "Adding to zip contents of a folder ${destination_folder_name}"
-zip -r -q $file ./${destination_folder_name}
+cd ${destination_folder_name}
+zip -r -q ../$file .
+cd ..
 echo "Successfully zipped ${destination_folder_name} into ${file}"
 java -jar ${workdir}/.github/scripts/self-extracting-jar-creator.jar $file
 echo "Remove temporary ${destination_folder_name}"