paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 16:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

postgres-init-db: Fix shellcheck warnings.

Browse Source 
In scripts/setup/postgres-init-db line 12:
records=`su "$POSTGRES_USER" -c "psql -Atc 'SELECT COUNT(*) FROM zulip.zerver_message;' zulip" | cat`
        ^-- SC2006: Use $(..) instead of legacy `..`.

In scripts/setup/postgres-init-db line 35:
source "$(dirname "$0")/terminate-psql-sessions" postgres zulip zulip_base
^-- SC1090: Can't follow non-constant source. Use a directive to specify location.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg
2018-08-03 00:14:47 +00:00
committed by Tim Abbott
parent edc5a7bdd0
commit e495eaa339
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/setup/postgres-init-db
View File

@@ -9,7 +9,7 @@ POSTGRES_USER="${POSTGRES_USER:-postgres}"
# We have to do this because on production database zulip may not exist, so psql # We have to do this because on production database zulip may not exist, so psql
# will fail with return code 2. Because set -e is on, this will cause the script # will fail with return code 2. Because set -e is on, this will cause the script
# to bail. # to bail.
records=`su "$POSTGRES_USER" -c "psql -Atc 'SELECT COUNT(*) FROM zulip.zerver_message;' zulip" | cat` records=$(su "$POSTGRES_USER" -c "psql -Atc 'SELECT COUNT(*) FROM zulip.zerver_message;' zulip" | cat)
if [[ $records -gt 200 ]] if [[ $records -gt 200 ]]
then then
@@ -32,6 +32,7 @@ fi
# Drop any open connections to any old database. Hackishly call using # Drop any open connections to any old database. Hackishly call using
# `source`, because postgres user may not be able to read this directory # `source`, because postgres user may not be able to read this directory
# if unpacked by root. # if unpacked by root.
# shellcheck source=/dev/null
source "$(dirname "$0")/terminate-psql-sessions" postgres zulip zulip_base source "$(dirname "$0")/terminate-psql-sessions" postgres zulip zulip_base
( (