From 01b434fca0d7420bf9f0048db0350837a42bd201 Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <clemens.schwaighofer@egplusww.com>
Date: Tue, 15 Apr 2025 08:44:00 +0900
Subject: [PATCH] Postgresql version check calls update formatting

---
 pg_db_dump_file.sh | 15 +++++++++++----
 pg_drop_restore.sh |  5 +----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pg_db_dump_file.sh b/pg_db_dump_file.sh
index 6920f61..bc040ee 100755
--- a/pg_db_dump_file.sh
+++ b/pg_db_dump_file.sh
@@ -58,7 +58,16 @@ LOG_PATH='';
 # DBPATH_BASE='';
 # defaults
 _BACKUPDIR='/mnt/backup/db_dumps_fc/';
-_DB_VERSION=$(pgv=$(pg_dump --version| grep "pg_dump" | cut -d " " -f 3); if [[ $(echo "${pgv}" | cut -d "." -f 1) -ge 10 ]]; then echo "${pgv}" | cut -d "." -f 1; else echo "${pgv}" | cut -d "." -f 1,2; fi );
+_DB_VERSION=$(
+	pgv=$(
+		pg_dump --version | grep "pg_dump" | cut -d " " -f 3
+	);
+	if [[ $(echo "${pgv}" | cut -d "." -f 1) -ge 10 ]]; then
+		echo "${pgv}" | cut -d "." -f 1;
+	else
+		echo "${pgv}" | cut -d "." -f 1,2;
+	fi
+);
 _DB_USER='postgres';
 _DB_PASSWD='';
 _DB_HOST='';
@@ -346,9 +355,7 @@ fi;
 if [ "${SET_IDENT}" -eq 1 ]; then
 	DUMP_DB_VERSION=$(
 		pgv=$(
-			"${PG_PATH}/pg_dump" --version | \
-				grep "pg_dump" | \
-				cut -d " " -f 3
+			"${PG_PATH}/pg_dump" --version | grep "pg_dump" | cut -d " " -f 3
 		);
 		if [[ $(echo "${pgv}" | cut -d "." -f 1) -ge 10 ]]; then
 			echo "${pgv}" | cut -d "." -f 1;
diff --git a/pg_drop_restore.sh b/pg_drop_restore.sh
index 39ace8a..5f01dcc 100755
--- a/pg_drop_restore.sh
+++ b/pg_drop_restore.sh
@@ -333,12 +333,9 @@ if [ -n "$ident" ]; then
 	fi;
 else
 	# try to run psql from default path and get the version number
-	# ident=$(pgv=$(pg_dump --version| grep "pg_dump" | cut -d " " -f 3); if [[ $(echo "${pgv}" | cut -d "." -f 1) -ge 10 ]]; then echo "${pgv}" | cut -d "." -f 1; else echo "${pgv}" | cut -d "." -f 1,2; fi );
 	ident=$(
 		pgv=$(
-			"pg_dump" --version | \
-				grep "pg_dump" | \
-				cut -d " " -f 3
+			"pg_dump" --version | grep "pg_dump" | cut -d " " -f 3
 		);
 		if [[ $(echo "${pgv}" | cut -d "." -f 1) -ge 10 ]]; then
 			echo "${pgv}" | cut -d "." -f 1;