Update tools.func
This commit is contained in:
parent
3f8bc362db
commit
6f0ad549cf
@ -108,10 +108,11 @@ install_postgresql() {
|
|||||||
|
|
||||||
if command -v psql >/dev/null; then
|
if command -v psql >/dev/null; then
|
||||||
CURRENT_PG_VERSION="$(psql -V | grep -oP '\s\K[0-9]+(?=\.)')"
|
CURRENT_PG_VERSION="$(psql -V | grep -oP '\s\K[0-9]+(?=\.)')"
|
||||||
if [[ "$CURRENT_PG_VERSION" != "$PG_VERSION" ]]; then
|
if [[ "$CURRENT_PG_VERSION" == "$PG_VERSION" ]]; then
|
||||||
msg_info "PostgreSQL Version $CURRENT_PG_VERSION found, replacing with $PG_VERSION"
|
msg_ok "PostgreSQL $PG_VERSION is already installed"
|
||||||
NEED_PG_INSTALL=true
|
|
||||||
fi
|
fi
|
||||||
|
msg_info "Found PostgreSQL version $CURRENT_PG_VERSION, upgrading to $PG_VERSION"
|
||||||
|
NEED_PG_INSTALL=true
|
||||||
else
|
else
|
||||||
msg_info "PostgreSQL not found, installing version $PG_VERSION"
|
msg_info "PostgreSQL not found, installing version $PG_VERSION"
|
||||||
NEED_PG_INSTALL=true
|
NEED_PG_INSTALL=true
|
||||||
@ -121,11 +122,10 @@ install_postgresql() {
|
|||||||
msg_info "Stopping PostgreSQL if running"
|
msg_info "Stopping PostgreSQL if running"
|
||||||
systemctl stop postgresql >/dev/null 2>&1 || true
|
systemctl stop postgresql >/dev/null 2>&1 || true
|
||||||
|
|
||||||
msg_info "Removing conflicting PostgreSQL packages"
|
msg_info "Removing pgdg repo and old GPG keys"
|
||||||
$STD apt-get purge -y "postgresql*"
|
|
||||||
rm -f /etc/apt/sources.list.d/pgdg.list /etc/apt/trusted.gpg.d/postgresql.gpg
|
rm -f /etc/apt/sources.list.d/pgdg.list /etc/apt/trusted.gpg.d/postgresql.gpg
|
||||||
|
|
||||||
msg_info "Setting up PostgreSQL Repository"
|
msg_info "Setting up PostgreSQL repository"
|
||||||
curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc |
|
curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc |
|
||||||
gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg
|
gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg
|
||||||
|
|
||||||
@ -133,7 +133,7 @@ install_postgresql() {
|
|||||||
>/etc/apt/sources.list.d/pgdg.list
|
>/etc/apt/sources.list.d/pgdg.list
|
||||||
|
|
||||||
$STD apt-get update
|
$STD apt-get update
|
||||||
$STD apt-get install -y "postgresql-${PG_VERSION}"
|
$STD apt-get install -y "postgresql-${PG_VERSION}" "postgresql-client-${PG_VERSION}"
|
||||||
|
|
||||||
msg_ok "Installed PostgreSQL ${PG_VERSION}"
|
msg_ok "Installed PostgreSQL ${PG_VERSION}"
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user