Bring over enhancements and fixed from Ansible side.

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="$?"