From 98fc25a132b3f8d1f3609608b07e69f5367c8af9 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Fri, 24 Oct 2025 15:19:54 -0700 Subject: [PATCH] Bring over enhancements and fixed from Ansible side. --- bashrc.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/bashrc.sh b/bashrc.sh index 149f76f..719c9a6 100644 --- a/bashrc.sh +++ b/bashrc.sh @@ -391,18 +391,22 @@ function today { date "+%Y%m%d" } export BACKUP_DIR="/srv/backup" -export BACKUP="Backup" +export DOCKER="Docker" export SYSTEM="System" function pull_prod_backup { - if [[ -z "$1" || ("$1" != "$BACKUP" && "$1" != "$SYSTEM") ]]; then - echo "ERROR: Parameter 1 not correct, expecting '$BACKUP' or '$SYSTEM'." + if [[ -z "$1" || ("$1" != "$DOCKER" && "$1" != "$SYSTEM") ]]; then + echo "ERROR: Parameter 1 not correct, expecting '$DOCKER' or '$SYSTEM'." return 1 fi backup_type="$1" - if [[ -f *"${backup_type}"*".zip" ]]; then + echo "Looking for '*${backup_type}*.zip'" + ls -lh *${backup_type}*.zip 2>/dev/null + status="$?" + if [[ "$status" == "0" ]]; then echo "File already downloaded, skipping." - ls -lh *"${backup_type}"*".zip" return 0 + else + echo "File still needed, downloading to local tmp/." fi mkdir -pv tmp scp -P $PROD_PORT \ @@ -421,7 +425,7 @@ function pull_prod_backups { dir="ProductionBackups-Pulled`today`" mkdir -pv "$dir" cd "$dir" - pull_prod_backup "$BACKUP" + pull_prod_backup "$DOCKER" pull_prod_backup "$SYSTEM" du -h *.zip status="$?"