From 0e3724a51a39c3ee93b5d9cece09a827f0bde364 Mon Sep 17 00:00:00 2001
From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com>
Date: Wed, 27 Sep 2023 17:06:26 +0000
Subject: [PATCH] chore: download the parent pom to output folder (#2040)

* chore: download the parent pom to output folder

* use pushd and popd
---
 library_generation/utilities.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/library_generation/utilities.sh b/library_generation/utilities.sh
index c00d8b78c8..1b97f0745f 100755
--- a/library_generation/utilities.sh
+++ b/library_generation/utilities.sh
@@ -81,27 +81,31 @@ download_gapic_generator_pom_parent() {
 get_grpc_version() {
   local gapic_generator_version=$1
   local grpc_version
+  pushd "${output_folder}" > /dev/null
   # get grpc version from gapic-generator-java-pom-parent/pom.xml
   download_gapic_generator_pom_parent "${gapic_generator_version}"
   grpc_version=$(grep grpc.version "gapic-generator-java-pom-parent-${gapic_generator_version}.pom" | sed 's/<grpc\.version>\(.*\)<\/grpc\.version>/\1/' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
-  echo "$grpc_version"
+  popd > /dev/null
+  echo "${grpc_version}"
 }
 
 get_protobuf_version() {
   local gapic_generator_version=$1
   local protobuf_version
+  pushd "${output_folder}" > /dev/null
   # get protobuf version from gapic-generator-java-pom-parent/pom.xml
   download_gapic_generator_pom_parent "${gapic_generator_version}"
   protobuf_version=$(grep protobuf.version "gapic-generator-java-pom-parent-${gapic_generator_version}.pom" | sed 's/<protobuf\.version>\(.*\)<\/protobuf\.version>/\1/' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | cut -d "." -f2-)
+  popd > /dev/null
   echo "${protobuf_version}"
 }
 
 download_tools() {
-  pushd "${output_folder}"
   local gapic_generator_version=$1
   local protobuf_version=$2
   local grpc_version=$3
   local os_architecture=$4
+  pushd "${output_folder}"
   download_generator_artifact "${gapic_generator_version}" "gapic-generator-java-${gapic_generator_version}.jar"
   download_protobuf "${protobuf_version}" "${os_architecture}"
   download_grpc_plugin "${grpc_version}" "${os_architecture}"
@@ -112,9 +116,10 @@ download_generator_artifact() {
   local gapic_generator_version=$1
   local artifact=$2
   local project=${3:-"gapic-generator-java"}
-  if [ ! -f "gapic-generator-java-${gapic_generator_version}.jar" ]; then
+  if [ ! -f "${artifact}" ]; then
     # first, try to fetch the generator locally
-    local local_fetch_successful=$(copy_from "$HOME/.m2/repository/com/google/api/${project}/${gapic_generator_version}/${artifact}" \
+    local local_fetch_successful
+    local_fetch_successful=$(copy_from "$HOME/.m2/repository/com/google/api/${project}/${gapic_generator_version}/${artifact}" \
       "${artifact}")
     if [[ "${local_fetch_successful}" == "false" ]];then 
       # download gapic-generator-java artifact from Google maven central mirror if not