Skip to content

Commit 04eb322

Browse files
authored
Use a PostgreSQL version agnostic method of determining if the database exists (#77)
Use PG version agnostic method to find DB
1 parent a5180bc commit 04eb322

File tree

1 file changed

+3
-3
lines changed
  • rootfs/etc/s6-overlay/s6-rc.d/teslamate

1 file changed

+3
-3
lines changed

rootfs/etc/s6-overlay/s6-rc.d/teslamate/run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ fi
5959

6060
# Create the PostgreSQL database if it doesn't exist
6161
if pg_isready -h "$DATABASE_HOST" -p "$DATABASE_PORT" > /dev/null 2>&1; then
62-
bashio::log.info "Creating database '$DATABASE_NAME' on $DATABASE_HOST"
62+
bashio::log.info "Checking for database '$DATABASE_NAME' on $DATABASE_HOST"
6363

64-
if [[ -n $(PGPASSWORD="$DATABASE_PASS" psql -h "$DATABASE_HOST" -p "$DATABASE_PORT" -U "$DATABASE_USER" postgres -Atqc "\list \"$DATABASE_NAME\"") ]]; then
64+
if [[ -n $(PGPASSWORD="$DATABASE_PASS" psql -h "$DATABASE_HOST" -p "$DATABASE_PORT" -U "$DATABASE_USER" postgres -Atqc "SELECT datname FROM pg_database WHERE datname = '$DATABASE_NAME'") ]]; then
6565
bashio::log.info "Database $DATABASE_NAME already exists"
6666
else
6767
if PGPASSWORD="$DATABASE_PASS" psql -h "$DATABASE_HOST" -p "$DATABASE_PORT" -U "$DATABASE_USER" postgres -qc "CREATE DATABASE \"$DATABASE_NAME\""; then
@@ -76,7 +76,7 @@ else
7676
exit 1
7777
fi
7878

79-
if [[ -z $(PGPASSWORD="$DATABASE_PASS" psql -h "$DATABASE_HOST" -p "$DATABASE_PORT" -U "$DATABASE_USER" "$DATABASE_NAME" -Atqc "SELECT 1 FROM settings WHERE base_url LIKE '%api/hassio_ingress%'") ]]; then
79+
if [[ -z $(PGPASSWORD="$DATABASE_PASS" psql -h "$DATABASE_HOST" -p "$DATABASE_PORT" -U "$DATABASE_USER" "$DATABASE_NAME" -Atqc "SELECT 1 FROM settings WHERE base_url LIKE '%api/hassio_ingress%'" 2&> /dev/null ) ]]; then
8080
teslamate_ingress=$(bashio::addon.ingress_entry)
8181
grafana_ingress=$(bashio::addon.ingress_entry $(bashio::supervisor.addons | grep grafana))
8282

0 commit comments

Comments
 (0)