From 681e358069ab80eccc99565e9dff26d6f3ba29b0 Mon Sep 17 00:00:00 2001
From: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
Date: Mon, 25 Mar 2019 13:59:08 +0100
Subject: [PATCH] Moved and user to env (#15) and code clean from PR #16.

---
 backup.sh | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/backup.sh b/backup.sh
index c6c1637..b08b58b 100755
--- a/backup.sh
+++ b/backup.sh
@@ -28,14 +28,20 @@ if [ "${POSTGRES_PASSWORD}" = "**None**" -a "${POSTGRES_PASSWORD_FILE}" = "**Non
 fi
 
 #Process vars
-if [ "${POSTGRES_DB_FILE}" = "**None**" ]; then
-  export POSTGRES_DB=$POSTGRES_DB
-elif [ -r "${POSTGRES_DB_FILE}" ]; then
-  export POSTGRES_DB=$(cat ${POSTGRES_DB_FILE})
+if [ "${POSTGRES_DB}" = "**None**" -a -r "${POSTGRES_DB_FILE}" ]; then
+  POSTGRES_DB=$(cat ${POSTGRES_DB_FILE})
 else
   echo "Missing POSTGRES_DB_FILE file."
   exit 1
 fi
+if [ "${POSTGRES_USER_FILE}" = "**None**" ]; then
+  export PGUSER=$POSTGRES_USER
+elif [ -r "${POSTGRES_USER_FILE}" ]; then
+  export PGUSER=$(cat ${POSTGRES_USER_FILE})
+else
+  echo "Missing POSTGRES_USER_FILE file."
+  exit 1
+fi
 if [ "${POSTGRES_PASSWORD_FILE}" = "**None**" ]; then
   export PGPASSWORD=$POSTGRES_PASSWORD
 elif [ -r "${POSTGRES_PASSWORD_FILE}" ]; then
@@ -44,15 +50,7 @@ else
   echo "Missing POSTGRES_PASSWORD_FILE file."
   exit 1
 fi
-if [ "${POSTGRES_USER_FILE}" = "**None**" ]; then
-  export POSTGRES_USER=$POSTGRES_USER
-elif [ -r "${POSTGRES_USER_FILE}" ]; then
-  export POSTGRES_USER=$(cat ${POSTGRES_USER_FILE})
-else
-  echo "Missing POSTGRES_USER_FILE file."
-  exit 1
-fi
-POSTGRES_HOST_OPTS="-h $POSTGRES_HOST -p $POSTGRES_PORT -U $POSTGRES_USER $POSTGRES_EXTRA_OPTS"
+POSTGRES_HOST_OPTS="-h $POSTGRES_HOST -p $POSTGRES_PORT $POSTGRES_EXTRA_OPTS"
 KEEP_DAYS=$BACKUP_KEEP_DAYS
 KEEP_WEEKS=`expr $((($BACKUP_KEEP_WEEKS * 7) + 1))`
 KEEP_MONTHS=`expr $((($BACKUP_KEEP_MONTHS * 31) + 1))`