diff --git a/RebuildBdd/Checkup/check-postgresql.sh b/RebuildBdd/Checkup/check-postgresql.sh index 33ae3e6..e28de4b 100755 --- a/RebuildBdd/Checkup/check-postgresql.sh +++ b/RebuildBdd/Checkup/check-postgresql.sh @@ -45,6 +45,13 @@ require_cmd() { command -v "$1" >/dev/null 2>&1 } +postgres_server_ready() { + require_cmd postgres || return 1 + require_cmd pg_ctlcluster || return 1 + require_cmd pg_lsclusters || return 1 + return 0 +} + ensure_postgres_cluster() { if ! require_cmd pg_lsclusters || ! require_cmd pg_createcluster; then return 0 @@ -147,7 +154,7 @@ fi POSTGRES_INSTALLED="no" -if ! require_cmd psql || ! require_cmd pg_restore || ! require_cmd createdb || ! require_cmd dropdb; then +if ! require_cmd psql || ! require_cmd pg_restore || ! require_cmd createdb || ! require_cmd dropdb || ! postgres_server_ready; then [[ "${AUTO_INSTALL_POSTGRES,,}" == "yes" ]] || fail "PostgreSQL absent et AUTO_INSTALL_POSTGRES=no" log "PostgreSQL absent : installation en cours..."