Merge pull request #18877 from ivanvc/release-3.4-backport-18812

[3.4] release: properly change working dir if tmp location already exists
etcd-io · Nov 12, 2024 · 4d43129 · 4d43129
2 parents c4d1505 + bd959e7
commit 4d43129
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -62,10 +62,12 @@ main() {
   # Set up release directory.
   local reldir="/tmp/etcd-release-${VERSION}"
   log_callout "Preparing temporary directory: ${reldir}"
-  if [ ! -d "${reldir}/etcd" ] && [ "${IN_PLACE}" == 0 ]; then
-    mkdir -p "${reldir}"
-    cd "${reldir}"
-    git clone "${REPOSITORY}" --branch "${BRANCH}" --depth 1
+  if [ "${IN_PLACE}" == 0 ]; then
+    if [ ! -d "${reldir}/etcd" ]; then
+      mkdir -p "${reldir}"
+      cd "${reldir}"
+      git clone "${REPOSITORY}" --branch "${BRANCH}" --depth 1
+    fi
     cd "${reldir}/etcd" || exit 2
     git checkout "${BRANCH}" || exit 2
     git pull origin