From c30782ba7c94b2290925ca470ff304bd2b40ff15 Mon Sep 17 00:00:00 2001
From: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Mon, 29 Jan 2024 13:03:03 -0500
Subject: [PATCH] generate_source_tarball.sh: Fix whitespace

Related: RHEL-30946
---
 generate_source_tarball.sh | 28 ++++++++++++++--------------
 java-21-openjdk.spec       |  1 +
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 7a328e6..addbc15 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -186,28 +186,28 @@ echo -e "\tTO_COMPRESS: ${TO_COMPRESS}"
 echo -e "\tBOOT_JDK: ${BOOT_JDK}"
 
 if [ -d "${FILE_NAME_ROOT}" ] ; then
-  echo "exists exists exists exists exists exists exists "
-  echo "reusing reusing reusing reusing reusing reusing "
-  echo "${FILE_NAME_ROOT}"
-  STAT_TIME="$(stat --format=%Y "${FILE_NAME_ROOT}")"
-  TAR_TIME="$(date --date=@"${STAT_TIME}" --iso-8601=seconds)"
+    echo "exists exists exists exists exists exists exists "
+    echo "reusing reusing reusing reusing reusing reusing "
+    echo "${FILE_NAME_ROOT}"
+    STAT_TIME="$(stat --format=%Y "${FILE_NAME_ROOT}")"
+    TAR_TIME="$(date --date=@"${STAT_TIME}" --iso-8601=seconds)"
 else
-  mkdir "${FILE_NAME_ROOT}"
-  pushd "${FILE_NAME_ROOT}"
-    echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
-    git clone --depth=1 -b "${VERSION}" "${REPO_ROOT}" "${VERSION}"
-    pushd "${VERSION}"
-      TAR_TIME="$(git log --max-count 1 --format=%cI)"
+    mkdir "${FILE_NAME_ROOT}"
+    pushd "${FILE_NAME_ROOT}"
+        echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
+        git clone --depth=1 -b "${VERSION}" "${REPO_ROOT}" "${VERSION}"
+        pushd "${VERSION}"
+            TAR_TIME="$(git log --max-count 1 --format=%cI)"
+        popd
     popd
-  popd
 fi
 pushd "${FILE_NAME_ROOT}"
     # Generate .src-rev so build has knowledge of the revision the tarball was
     # created from
     mkdir build
     pushd build
-    sh "${PWD}"/../"${VERSION}"/configure --with-boot-jdk="${BOOT_JDK}"
-    make store-source-revision
+        sh "${PWD}"/../"${VERSION}"/configure --with-boot-jdk="${BOOT_JDK}"
+        make store-source-revision
     popd
     rm -rf build
 
diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index 7fd7b55..ed1b3c5 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -2527,6 +2527,7 @@ cjc.mainProgram(args)
 - generate_source_tarball.sh: shellcheck: Do not use $ on arithmetic variables (SC2004)
 - Use backward-compatible patch syntax
 - generate_source_tarball.sh: Ignore -ga tags with OPENJDK_LATEST
+- generate_source_tarball.sh: Fix whitespace
 - Related: RHEL-30946
 
 * Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.1-0.2.ea