From 5783e1ef8f76dd05e6502357f9fc072493249dee Mon Sep 17 00:00:00 2001
From: Sarah Gilmore <sgilmore@mathworks.com>
Date: Tue, 9 Jul 2024 09:51:59 -0400
Subject: [PATCH] Use apache-arrow-{version} as the tarball source directory

---
 dev/release/utils-create-release-tarball.sh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/dev/release/utils-create-release-tarball.sh b/dev/release/utils-create-release-tarball.sh
index 1a0ba83639b9a..0ca57ebe78c01 100755
--- a/dev/release/utils-create-release-tarball.sh
+++ b/dev/release/utils-create-release-tarball.sh
@@ -30,26 +30,27 @@ version=$1
 rc=$2
 
 tag=apache-arrow-${version}-rc${rc}
+root_folder=apache-arrow-${version}
 tarball=apache-arrow-${version}.tar.gz
 
 : ${release_hash:=$(git rev-list --max-count=1 ${tag})}
 
-rm -rf ${tag}
+rm -rf ${root_folder}
 
 # be conservative and use the release hash, even though git produces the same
 # archive (identical hashes) using the scm tag
 (cd "${SOURCE_TOP_DIR}" && \
-  git archive ${release_hash} --prefix ${tag}/) | \
+  git archive ${release_hash} --prefix ${root_folder}/) | \
   tar xf -
 
 # Resolve symbolic and hard links
-rm -rf ${tag}.tmp
-mv ${tag} ${tag}.tmp
-cp -R -L ${tag}.tmp ${tag}
-rm -rf ${tag}.tmp
+rm -rf ${root_folder}.tmp
+mv ${root_folder} ${root_folder}.tmp
+cp -R -L ${root_folder}.tmp ${root_folder}
+rm -rf ${root_folder}.tmp
 
 # Create a dummy .git/ directory to download the source files from GitHub with Source Link in C#.
-dummy_git=${tag}/csharp/dummy.git
+dummy_git=${root_folder}/csharp/dummy.git
 mkdir ${dummy_git}
 pushd ${dummy_git}
 echo ${release_hash} > HEAD
@@ -58,5 +59,5 @@ mkdir objects refs
 popd 
 
 # Create new tarball from modified source directory
-tar czf ${tarball} ${tag}
-rm -rf ${tag}
+tar czf ${tarball} ${root_folder}
+rm -rf ${root_folder}