From 97b52bbbeaeb7fd1937b502ee81cdcdc929dbe55 Mon Sep 17 00:00:00 2001 From: zenaku Date: Wed, 30 Sep 2026 21:21:56 +0200 Subject: [PATCH] fix: move info() to top, log before deleting backup dir --- rollback.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/rollback.sh b/rollback.sh index c7abdee..a112417 100755 --- a/rollback.sh +++ b/rollback.sh @@ -17,6 +17,7 @@ ok() { echo -e "${GREEN}[OK]${RESET} $1"; echo "[OK-ROLLBACK] $1" >> "$LOG" 2 warn() { echo -e "${YELLOW}[!]${RESET} $1"; echo "[!-ROLLBACK] $1" >> "$LOG" 2>/dev/null || true; } fail() { echo -e "${RED}[X]${RESET} $1"; echo "[X-ROLLBACK] $1" >> "$LOG" 2>/dev/null || true; exit 1; } sep() { echo -e "\n${CYAN}────────────────────────────────────${RESET}"; } +info() { echo -e "${CYAN}[i]${RESET} $1"; echo "[i-ROLLBACK] $1" >> "$LOG" 2>/dev/null || true; } [ -f "$BACKUP_DIR/legacy_compose_dir" ] || fail "No backup found at $BACKUP_DIR. Cannot rollback." @@ -63,8 +64,8 @@ sudo rm -f /etc/nginx/sites-enabled/operator /etc/nginx/sites-available/operator # Restore backed-up nginx configs if [ -d "$BACKUP_DIR/nginx/sites-available" ]; then - sudo cp -r "$BACKUP_DIR/nginx/sites-available/." /etc/nginx/sites-available/ 2>/dev/null || true - sudo cp -r "$BACKUP_DIR/nginx/sites-enabled/." /etc/nginx/sites-enabled/ 2>/dev/null || true + sudo find "$BACKUP_DIR/nginx/sites-available" -mindepth 1 -maxdepth 1 -not -type d -exec cp {} /etc/nginx/sites-available/ \; + sudo find "$BACKUP_DIR/nginx/sites-enabled" -mindepth 1 -maxdepth 1 -not -type d -exec cp {} /etc/nginx/sites-enabled/ \; ok "Nginx configs restored from backup." fi @@ -88,7 +89,6 @@ ok "operator-docker removed." # ─── Start Go legacy ────────────────────────────────────────────────────────── sep -info() { echo -e "${CYAN}[i]${RESET} $1"; } info "Starting Go legacy stack..." sudo modprobe ip6table_filter 2>/dev/null || true cd "$LEGACY_COMPOSE_DIR" @@ -105,3 +105,7 @@ echo " Rollback complete" echo " Legacy stack: $LEGACY_COMPOSE_DIR" echo " Log: cat $LOG" echo "=========================================" + +# ─── Delete migration backup ────────────────────────────────────────────────── +ok "Migration backup deleted." +rm -rf "$BACKUP_DIR"