From 63b2ca815184cafc4ddd90295cf048115c6d2ecb Mon Sep 17 00:00:00 2001 From: uprightbass360 Date: Wed, 3 Dec 2025 22:13:22 -0500 Subject: [PATCH] backup fixes --- scripts/bash/db-import-conditional.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/bash/db-import-conditional.sh b/scripts/bash/db-import-conditional.sh index 578cc86..e800a5e 100755 --- a/scripts/bash/db-import-conditional.sh +++ b/scripts/bash/db-import-conditional.sh @@ -219,10 +219,12 @@ if [ -z "$backup_path" ]; then echo "📦 Latest daily backup found: $latest_daily" for backup_file in "$BACKUP_DIRS/daily/$latest_daily"/*.sql.gz; do if [ -f "$backup_file" ] && [ -s "$backup_file" ]; then - if timeout 10 zcat "$backup_file" 2>/dev/null | head -20 | grep -q "CREATE DATABASE\|INSERT INTO\|CREATE TABLE"; then + if timeout 10 gzip -t "$backup_file" >/dev/null 2>&1; then echo "✅ Valid daily backup file: $(basename "$backup_file")" backup_path="$BACKUP_DIRS/daily/$latest_daily" break 2 + else + echo "⚠️ gzip validation failed for $(basename "$backup_file")" fi fi done @@ -237,10 +239,12 @@ if [ -z "$backup_path" ]; then echo "📦 Latest hourly backup found: $latest_hourly" for backup_file in "$BACKUP_DIRS/hourly/$latest_hourly"/*.sql.gz; do if [ -f "$backup_file" ] && [ -s "$backup_file" ]; then - if timeout 10 zcat "$backup_file" >/dev/null 2>&1; then + if timeout 10 gzip -t "$backup_file" >/dev/null 2>&1; then echo "✅ Valid hourly backup file: $(basename "$backup_file")" backup_path="$BACKUP_DIRS/hourly/$latest_hourly" break 2 + else + echo "⚠️ gzip validation failed for $(basename "$backup_file")" fi fi done @@ -259,10 +263,12 @@ if [ -z "$backup_path" ]; then echo "🔍 Validating timestamped backup content..." for backup_file in "$BACKUP_DIRS/$latest_timestamped"/*.sql.gz; do if [ -f "$backup_file" ] && [ -s "$backup_file" ]; then - if timeout 10 zcat "$backup_file" >/dev/null 2>&1; then + if timeout 10 gzip -t "$backup_file" >/dev/null 2>&1; then echo "✅ Valid timestamped backup found: $(basename "$backup_file")" backup_path="$BACKUP_DIRS/$latest_timestamped" break 2 + else + echo "⚠️ gzip validation failed for $(basename "$backup_file")" fi fi done