Skip to content

Commit 48b3f5d

Browse files
committed
Control database setup output better.
1 parent fd3a77a commit 48b3f5d

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

setup-db.sh

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/usr/bin/env bash
22

3-
set -xe
4-
53
DATABASE_URL="${DATABASE_URL:-postgres://postgres:ughfineokifitsfordebugging@localhost:54320/rfcbot}"
64

75
until psql -d "$DATABASE_URL" -c '\q'; do
@@ -11,8 +9,17 @@ done
119

1210
>&2 echo "Postgres is up - executing commands"
1311

12+
set -e
1413
diesel database setup
1514
diesel migration run
16-
psql -q -d "$DATABASE_URL" --file ./githubuser-backup.pg
15+
set +e
16+
17+
sql_output="$(psql -q -d "$DATABASE_URL" --file ./githubuser-backup.pg)"
18+
sql_status="$?"
19+
20+
if [ ! $sql_status ]; then
21+
echo "$sql_output"
22+
exit $sql_status
23+
fi
1724

1825
exec "$@"

0 commit comments

Comments
 (0)