From 2c1657efd3b6b8cadbd5267da5ce95b839f17915 Mon Sep 17 00:00:00 2001
From: admire <admire@kartoza.com>
Date: Tue, 2 Mar 2021 07:45:59 +0200
Subject: [PATCH] Fix pr review issues

---
 scripts/setup-conf.sh     |  2 +-
 scripts/setup-database.sh | 10 +++++-----
 scripts/setup-pg_hba.sh   |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/setup-conf.sh b/scripts/setup-conf.sh
index d27e437..a96fe90 100644
--- a/scripts/setup-conf.sh
+++ b/scripts/setup-conf.sh
@@ -82,7 +82,7 @@ if [[ ! -f ${ROOT_CONF}/extra.conf ]]; then
       echo "include 'extra.conf'" >> $CONF
     else
       # default value
-      if [[  ! -z $EXTRA_CONF ]]; then
+      if [[  -n "$EXTRA_CONF" ]]; then
           echo -e $EXTRA_CONF >> ${ROOT_CONF}/extra.conf
           echo "include 'extra.conf'" >> $CONF
       fi
diff --git a/scripts/setup-database.sh b/scripts/setup-database.sh
index 0cc8624..85569e7 100644
--- a/scripts/setup-database.sh
+++ b/scripts/setup-database.sh
@@ -83,14 +83,14 @@ done
 
 # Create schemas in the DB
 for db in $(echo ${POSTGRES_DBNAME} | tr ',' ' '); do
-    for schemas in $(echo ${SCHEMA_NAME} | tr ',' ' '); do
+    for schema in $(echo ${SCHEMA_NAME} | tr ',' ' '); do
       SCHEMA_RESULT=`PGPASSWORD=${POSTGRES_PASS} psql -t ${db} -U ${POSTGRES_USER} -p 5432 -h localhost -c "select count(1) from information_schema.schemata where schema_name = '${schemas}' and catalog_name = '${db}';"`
      if [[ ${SCHEMA_RESULT} -eq 0 ]] && [[ "${ALL_DATABASES}" =~ [Ff][Aa][Ll][Ss][Ee] ]]; then
-          echo "Creating schema ${schemas} in database ${SINGLE_DB}"
-          PGPASSWORD=${POSTGRES_PASS} psql ${SINGLE_DB} -U ${POSTGRES_USER} -p 5432 -h localhost -c " CREATE SCHEMA IF NOT EXISTS ${schemas};"
+          echo "Creating schema ${schema} in database ${SINGLE_DB}"
+          PGPASSWORD=${POSTGRES_PASS} psql ${SINGLE_DB} -U ${POSTGRES_USER} -p 5432 -h localhost -c " CREATE SCHEMA IF NOT EXISTS ${schema};"
       elif [[ ${SCHEMA_RESULT} -eq 0 ]] && [[ "${ALL_DATABASES}" =~ [Tt][Rr][Uu][Ee] ]]; then
-          echo "Creating schema ${schemas} in database ${db}"
-          PGPASSWORD=${POSTGRES_PASS} psql ${db} -U ${POSTGRES_USER} -p 5432 -h localhost -c " CREATE SCHEMA IF NOT EXISTS ${schemas};"
+          echo "Creating schema ${schema} in database ${db}"
+          PGPASSWORD=${POSTGRES_PASS} psql ${db} -U ${POSTGRES_USER} -p 5432 -h localhost -c " CREATE SCHEMA IF NOT EXISTS ${schema};"
       fi
     done
 done
diff --git a/scripts/setup-pg_hba.sh b/scripts/setup-pg_hba.sh
index 912083d..6883c04 100644
--- a/scripts/setup-pg_hba.sh
+++ b/scripts/setup-pg_hba.sh
@@ -19,7 +19,7 @@ echo "host    all             all             192.168.0.0/16               ${PAS
 
 # Custom IP range via docker run -e (https://docs.docker.com/engine/reference/run/#env-environment-variables)
 # Usage is: docker run [...] -e ALLOW_IP_RANGE='192.168.0.0/16'
-if [[ "$ALLOW_IP_RANGE" ]]
+if [[ -n "$ALLOW_IP_RANGE" ]]
 then
 	echo "Add rule to pg_hba: $ALLOW_IP_RANGE"
  	echo "host    all             all             $ALLOW_IP_RANGE              ${PASSWORD_AUTHENTICATION}" >> ${ROOT_CONF}/pg_hba.conf