fix tag_release (internetarchive#11143)

* fix deploys: tag_release, cleandirs

Author: mekarpeles

scripts/deployment/deploy.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 clean_exit() {
-    if [ -n "$DEPLOY_DIR" ]; then
+    if [ -d "$DEPLOY_DIR" ]; then
         cleanup "$DEPLOY_DIR"
     fi
     exit 1
@@ -233,6 +233,11 @@ deploy_olsystem() {
     done
     echo -e "No changes found in the $REPO repo on the servers.\n"
 
+    cd $DEPLOY_DIR
+    if [ -d "$DEPLOY_DIR/$REPO_NEW" ]; then
+        cleanup "$DEPLOY_DIR/$REPO_NEW"
+    fi
+
     # Get the latest code
     echo -ne "Cloning $REPO repo ... "
     git clone --depth=1 "$CLONE_URL" $REPO_NEW 2> /dev/null
@@ -350,6 +355,12 @@ deploy_openlibrary() {
     echo "[Now] Deploying openlibrary"
 
     cd $DEPLOY_DIR
+    if [ -d "$DEPLOY_DIR/openlibrary" ]; then
+        cleanup "$DEPLOY_DIR/openlibrary"
+    fi
+    if [ -d "$DEPLOY_DIR/openlibrary_new" ]; then
+        cleanup "$DEPLOY_DIR/openlibrary_new"
+    fi
     echo -ne "Cloning openlibrary repo ... "
     git clone --depth=1 "https://github.com/internetarchive/openlibrary.git" openlibrary 2> /dev/null
     GIT_SHA=$(git -C openlibrary rev-parse HEAD | cut -c -7)
@@ -413,8 +424,6 @@ deploy_openlibrary() {
     echo "Finished production deployment at $(date)"
     echo "To reboot the servers, please run scripts/deployments/restart_all_servers.sh"
 
-    cleanup "${DEPLOY_DIR}/openlibrary"
-
     echo "[Info] Skipping booklending utils; see \`deploy.sh utils\`"
     echo "[Next] Run review aka are_servers_in_sync.sh (~50s as of 2024-12-09):"
     echo "time ./scripts/deployment/deploy.sh review"
@@ -655,8 +664,6 @@ deploy_wizard() {
         echo ""
         echo "The Open Library weekly deploy is now complete. See changes here: https://github.com/internetarchive/openlibrary/releases/tag/$LATEST_TAG_NAME. Please let us know @here if anything seems broken or delightful!"
     fi
-
-    cleanup "$DEPLOY_DIR"
 }
 
 # See deployment documentation at https://github.com/internetarchive/olsystem/wiki/Deployments
@@ -692,3 +699,8 @@ else
     echo "e.g: time SERVER_SUFFIX='.us.archive.org' ./scripts/deployment/deploy.sh [command]"
     exit 1
 fi
+
+# In all cases, cleanup upon success
+if [ -d "$DEPLOY_DIR" ]; then
+    cleanup "$DEPLOY_DIR"
+fi