From b733b451d83c91ca8be58d16ea2a476941f03159 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Sun, 25 Jun 2023 18:11:35 -0400
Subject: [PATCH] Update postgresql-install.sh

distribution agnostic
---
 install/postgresql-install.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/install/postgresql-install.sh b/install/postgresql-install.sh
index 5f455031..309b2d50 100644
--- a/install/postgresql-install.sh
+++ b/install/postgresql-install.sh
@@ -21,8 +21,9 @@ $STD apt-get install -y gnupg
 msg_ok "Installed Dependencies"
 
 msg_info "Setting up PostgreSQL Repository"
-sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
-$STD apt-key add <(curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc)
+VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)"
+echo "deb http://apt.postgresql.org/pub/repos/apt ${VERSION}-pgdg main" >/etc/apt/sources.list.d/pgdg.list
+curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor --output /etc/apt/trusted.gpg.d/postgresql.gpg
 msg_ok "Setup PostgreSQL Repository"
 
 msg_info "Installing PostgreSQL"
@@ -136,8 +137,8 @@ read -r -p "Would you like to add Adminer? <y/N> " prompt
 if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
   msg_info "Installing Adminer"
   $STD apt install -y adminer
-  $STD sudo a2enconf adminer
-  $STD systemctl reload apache2
+  $STD a2enconf adminer
+  systemctl reload apache2
   msg_ok "Installed Adminer"
 fi