From 53879c46738454166751d9b8b771aa8e3ca2b65a Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulipchat.com>
Date: Fri, 12 Apr 2019 16:30:49 -0700
Subject: [PATCH] scripts: Rename DEFAULT_USER to POSTGRES_USER.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
---
 scripts/setup/terminate-psql-sessions |  6 +++---
 tools/setup/postgres-init-dev-db      | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/setup/terminate-psql-sessions b/scripts/setup/terminate-psql-sessions
index d243fccbe6..cb7da383cd 100755
--- a/scripts/setup/terminate-psql-sessions
+++ b/scripts/setup/terminate-psql-sessions
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 set -e
 
-DEFAULT_USER="postgres"
+POSTGRES_USER="postgres"
 if [ "$(uname)" = "OpenBSD" ]; then
-  DEFAULT_USER="_postgresql"
+  POSTGRES_USER="_postgresql"
 fi
 
 cd /
@@ -15,7 +15,7 @@ tables="$(printf "'%s'," "${@//\'/\'\'}")"
 tables="${tables%,}"
 
 if [ "$EUID" -eq 0 ]; then
-    su - "$DEFAULT_USER" -c "psql postgres '$DEFAULT_USER'" <<EOF
+    su - "$POSTGRES_USER" -c "psql postgres '$POSTGRES_USER'" <<EOF
 SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname IN ($tables);
 EOF
 else
diff --git a/tools/setup/postgres-init-dev-db b/tools/setup/postgres-init-dev-db
index 33d584f24c..198a7e7f5c 100755
--- a/tools/setup/postgres-init-dev-db
+++ b/tools/setup/postgres-init-dev-db
@@ -2,12 +2,12 @@
 set -x
 set -e
 
-DEFAULT_USER="postgres"
+POSTGRES_USER="postgres"
 if [ "$(uname)" = "OpenBSD" ]; then
-  DEFAULT_USER="_postgresql"
+  POSTGRES_USER="_postgresql"
 fi
 
-ROOT_POSTGRES=(sudo -i -u "$DEFAULT_USER" psql)
+ROOT_POSTGRES=(sudo -i -u "$POSTGRES_USER" psql)
 DEFAULT_DB=""
 if [ "$(uname)" = "Darwin" ]; then
    ROOT_POSTGRES=(psql)
@@ -39,13 +39,13 @@ fi
 
 DBNAME_BASE=${DBNAME}_base
 
-if ! pg_isready -U "$DEFAULT_USER" -q; then
+if ! pg_isready -U "$POSTGRES_USER" -q; then
     set +x
     echo
     echo 'ERROR: PostgreSQL Server is not running! Ensure the service is enabled.'
     # shellcheck disable=SC2016
     echo 'ERROR: Try `sudo service postgresql start`?'
-    echo "ERROR: You can easily test if you fixed it using: pg_isready -U \$DEFAULT_USER"
+    echo "ERROR: You can easily test if you fixed it using: pg_isready -U \$POSTGRES_USER"
     exit 1
 fi