From 966c1c131fb9e028cf0f9e3732f905f5f4877514 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Thu, 13 Jul 2023 17:51:03 -0400
Subject: [PATCH] GH Hosted: corrections to execute sign script

---
 .github/scripts/sign-exe-in-zip-file.sh       |  9 +++---
 .../experimental-eclipse-distro-build.yml     |  4 +--
 .../pom.xml                                   | 28 +++++++++++++++----
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/.github/scripts/sign-exe-in-zip-file.sh b/.github/scripts/sign-exe-in-zip-file.sh
index b83998e79..9cefc7efa 100755
--- a/.github/scripts/sign-exe-in-zip-file.sh
+++ b/.github/scripts/sign-exe-in-zip-file.sh
@@ -6,7 +6,8 @@ echo "****************************************************************"
 echo "*** Processing : ${file}"
 echo "****************************************************************"
 destination_folder_name=extracted_${filename}
-unzip $file -d ./${destination_folder_name}
-sts_folder=find ./${destination_folder_name} -maxdepth 1 -type d -name 'sts-*' -print -quit
-$sign_script ${sts_folder}/SpringToolSuite4.exe ${sts_folder}/SpringToolSuite4.exe
-zip -r $file ./${destination_folder_name}
+unzip -q $file -d ./${destination_folder_name}
+sts_folder=`find ./${destination_folder_name} -maxdepth 1 -type d -name 'sts-*' -print -quit`
+echo "Found folder: ${sts_folder}"
+$sign_script ./${sts_folder}/SpringToolSuite4.exe ${sts_folder}/SpringToolSuite4.exe
+zip -r -q $file ./${destination_folder_name}
diff --git a/.github/workflows/experimental-eclipse-distro-build.yml b/.github/workflows/experimental-eclipse-distro-build.yml
index a2aee5c3f..3ca2a7d7a 100644
--- a/.github/workflows/experimental-eclipse-distro-build.yml
+++ b/.github/workflows/experimental-eclipse-distro-build.yml
@@ -106,9 +106,9 @@ jobs:
           SSH_KEY: ~bamboo/.ssh/id_rsa
           SSH_USER: signer
         run: |
-          ls -la
+          workdir=`pwd`
           files=`ls *.zip`
           for file in $files
           do
-            ./.github/scripts/sign-exe-in-zip-file.sh $file ./github/scripts/sign-exe.sh
+            ./.github/scripts/sign-exe-in-zip-file.sh $file ${workdir}/.github/scripts/sign-exe.sh
           done
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
index bf43257d2..81e3b85ce 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
@@ -652,7 +652,7 @@
 
 					<execution>
 						<id>update-nightly-downloads</id>
-						<phase>deploy</phase>
+						<phase>verify</phase>
 						<configuration>
 							<skip>${skip.update-nightly-download-page}</skip>
 							<target>
@@ -665,11 +665,27 @@
 								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@TARGET@" value="${dist.target}" summary="yes" />
 								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@MAJOR-TARGET@" value="${dist.target.major}" summary="yes" />
 
-								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
-									<upload bucketName="${dist.bucket}" file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"
-										toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
-									</upload>
-								</s3>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>upload-nightly-downloads</id>
+						<phase>deploy</phase>
+						<configuration>
+							<skip>${skip.update-nightly-download-page}</skip>
+							<target>
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
+
+                                <s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
+                                    <upload bucketName="${dist.bucket}" file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"
+    	                                toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
+	                                </upload>
+                                </s3>
 							</target>
 						</configuration>
 						<goals>