From 544ff6434bfbc164bed0d442bf900ec95afc8ef3 Mon Sep 17 00:00:00 2001
From: Yonguk Jeong <yonguk@nyu.edu>
Date: Sat, 4 Apr 2020 13:22:45 -0400
Subject: [PATCH] Fix setup script to reflect settings in env file

---
 scripts/setup.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/scripts/setup.sh b/scripts/setup.sh
index 9703261d..c82ed574 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -75,10 +75,21 @@ case $yn in
     ;;
 esac
 
+source $SCRIPT_DIR/../.env
+[[ -z $DB_USER ]] && DB_USER="postgres"
+[[ -z $DB_PASSWORD ]] && DB_PASSWORD=""
+[[ -z $DB_HOST ]] && DB_HOST="localhost"
+[[ -z $DB_PORT ]] && DB_PORT="5432"
+
 echo ""
-if ! psql -c "CREATE DATABASE mercury;" -U postgres 2> /dev/null; then # if it already exists, an error occurs. ignore it
-  __system "mercury database exists. Skip creating it"
+__system "Checking postgres connection..."
+psql postgresql://$DB_USER:$DB_PASSWORD@$DB_HOST:$DB_PORT -c "" || exit 1
+__success "postgres connection"
+
+if ! psql postgresql://$DB_USER:$DB_PASSWORD@$DB_HOST:$DB_PORT -c "CREATE DATABASE mercury;" 2> /dev/null; then # if it already exists, an error occurs. ignore it
+  __system "Skip creating mercury database"
 fi
+
 __success "mercury database"
 
 echo ""