From a90de2c314ef6a1b4cd338d921060ee684e1c138 Mon Sep 17 00:00:00 2001
From: aboyko <alex.boyko@broadcom.com>
Date: Thu, 7 Nov 2024 00:31:13 -0500
Subject: [PATCH] [GHA] wrap up

---
 .github/scripts/sign-exe.sh                          | 4 ++--
 .github/workflows/gh-hosted-eclipse-distro-build.yml | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/scripts/sign-exe.sh b/.github/scripts/sign-exe.sh
index 353c015da..b53b0deaa 100755
--- a/.github/scripts/sign-exe.sh
+++ b/.github/scripts/sign-exe.sh
@@ -10,8 +10,8 @@ echo "Copying ${in_file} to s3 s3://${AWS_S3_BUCKET}/exes-to-sign/${id}.exe for
 aws s3 cp $in_file s3://$AWS_S3_BUCKET/exes-to-sign/$id.exe
 for (( i=wait_time; i<timeout; i+=wait_time )) ; {
   sleep $wait_time
-  aws s3api head-object --bucket $CDN_BUCKET --key spring-tools/exes-signed/$id.exe || NOT_EXIST=true
-  if [ $NOT_EXIST ]; then
+  object_exists=$(aws s3api head-object --bucket $CDN_BUCKET --key spring-tools/exes-signed/$id.exe || true)
+  if [ -z "$object_exists" ]; then
     echo "Waited ${i} seconds but ${in_filename} hasn't been signed yet..."
   else
     echo "Successfully signed file ${in_filename}"
diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index 692b5121b..ecfa32f4f 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -147,7 +147,6 @@ jobs:
       - name: Upload Win Zip to S3 for Signing via JFrog
         run: |
           aws s3 rm s3://$AWS_S3_BUCKET/sts4-distro-win-sign/${{ inputs.eclipse_profile }} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip" --exclude "*/*"
-          aws s3 cp ${{ github.workspace }}/eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products s3://$AWS_S3_BUCKET/sts4-distro-win-sign/${{ inputs.eclipse_profile }} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip" --exclude "*/*" --no-progress
     outputs:
       id: ${{ inputs.eclipse_profile }}-${{ inputs.build_type }}-${{ github.run_id }}
       dist_path: ${{ steps.s3-paths.outputs.dist_path }}