From ffb744f80cff511dd17fb4333ef414649ed1c73c Mon Sep 17 00:00:00 2001
From: Aaron Johnon <amjohnson@skyfall.tech>
Date: Thu, 8 Jul 2021 01:42:12 -0500
Subject: [PATCH] moved for loops inside of case switch, so that it only needs
 to be evaluated once

---
 postgres_backup.sh | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/postgres_backup.sh b/postgres_backup.sh
index 8656e3f..e649ee3 100755
--- a/postgres_backup.sh
+++ b/postgres_backup.sh
@@ -14,6 +14,7 @@
 source ${HOME}/.postgres_backup.conf
 # END CONFIG
 
+
 ## Check if automated, set appropriate directory
 [ "$1" = "auto" ] && DIR=${DIR}/auto || DIR=${DIR}/manual
 
@@ -23,31 +24,21 @@ DATE=$(date +%Y%m%d-%H%M)
 ## Get list of DBs
 list_db=$(psql -p${PORT} -U postgres -t -c 'select datname from pg_database;' | grep -v 'template0\|template1\|postgres' | sed '/^$/d')
 
-for db in $list_db; do
-	case $COMPRESSION in
-		xz)
-			pg_dump -O $db | xz -T${THREADS} -${COMP_LEVEL} - > ${DIR}/${db}-${DATE}.dmp.xz
-			;;
-		zstd)
-			pg_dump -O $db | zstd -T${THREADS} -${COMP_LEVEL} -z - > ${DIR}/${db}-${DATE}.dmp.zst
-			;;
-		*)
-			echo "ERROR 11: Compression not configured correctly!"
-		        exit 11
-			;;
-	esac
-done
-
-## Dump Globals
 case $COMPRESSION in
 	xz)
 		pg_dumpall -p${PORT} -g | xz -T${THREADS} -${COMP_LEVEL} - > ${DIR}/globals_${DATE}.dmp.xz
+		for db in $list_db; do
+			pg_dump -O $db | xz -T${THREADS} -${COMP_LEVEL} - > ${DIR}/${db}-${DATE}.dmp.xz
+		done
 		;;
 	zstd)
 		pg_dumpall -p${PORT} -g | zstd -T${THREADS} -${COMP_LEVEL} -z - > ${DIR}/globals_${DATE}.dmp.zst
+		for db in $list_db; do
+			pg_dump -O $db | zstd -T${THREADS} -${COMP_LEVEL} -z - > ${DIR}/${db}-${DATE}.dmp.zst
+		done
 		;;
 	*)
-		echo "ERROR 11: Compression not configured correctly!"
+		echo "ERROR 11: Compression not configured correctly!" >2
 		exit 11
 		;;
 esac