From c24c858562e221e3d2b834227c7e24acf4254e59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20B=C3=A9dard-Couture?= <remi.bc@outlook.com>
Date: Thu, 3 Jul 2025 14:55:51 -0400
Subject: [PATCH] Fix fetch command in update path to retrieve binaries and
 clean up old commented code

---
 ct/keycloak.sh              |  2 +-
 install/keycloak-install.sh | 31 +++----------------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/ct/keycloak.sh b/ct/keycloak.sh
index f28e152d..8d897845 100644
--- a/ct/keycloak.sh
+++ b/ct/keycloak.sh
@@ -43,7 +43,7 @@ function update_script() {
   tar -czf keycloak_conf_backup.tar.gz keycloak.old/conf
   msg_ok "Backup done"
 
-  fetch_and_deploy_gh_release "keycloak" "keycloak/keycloak" "tarball" "latest" "/opt/keycloak"
+  fetch_and_deploy_gh_release "keycloak" "keycloak/keycloak" "prebuild" "latest" "/opt/keycloak" "keycloak-*.tar.gz"
 
   msg_info "Updating ${APP}"
   cd /opt
diff --git a/install/keycloak-install.sh b/install/keycloak-install.sh
index b7ced765..6d1deb16 100644
--- a/install/keycloak-install.sh
+++ b/install/keycloak-install.sh
@@ -13,44 +13,20 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies (Patience)"
-#$STD apt-get install -y ca-certificates-java
-msg_ok "Installed Dependencies"
-
-#msg_info "Installing OpenJDK"
-#$STD apt install wget lsb-release -y
-#$STD wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
-#$STD dpkg -i packages-microsoft-prod.deb
-#$STD apt update
-#$STD apt install -y msopenjdk-21
-#sudo update-java-alternatives --set msopenjdk-21-amd64
-#rm packages-microsoft-prod.deb
-#msg_ok "Installed OpenJDK"
-
 JAVA_VERSION=21 setup_java
-
-
-msg_info "Installing PostgreSQL"
-#$STD apt-get install -y postgresql
 PG_VERSION=16 setup_postgresql
+
+msg_info "Configuring PostgreSQL user"
 DB_NAME="keycloak"
 DB_USER="keycloak"
 DB_PASS="$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | cut -c1-13)"
 $STD sudo -u postgres psql -c "CREATE USER $DB_USER WITH PASSWORD '$DB_PASS';"
 $STD sudo -u postgres psql -c "CREATE DATABASE $DB_NAME WITH OWNER $DB_USER ENCODING 'UTF8';"
 $STD sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE $DB_NAME TO $DB_USER;"
-msg_ok "Installed PostgreSQL"
+msg_ok "Configured PostgreSQL user"
 
 fetch_and_deploy_gh_release "keycloak" "keycloak/keycloak" "prebuild" "latest" "/opt/keycloak" "keycloak-*.tar.gz"
 
-#msg_info "Installing Keycloak"
-#temp_file=$(mktemp)
-#RELEASE=$(curl -fsSL https://api.github.com/repos/keycloak/keycloak/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-#curl -fsSL "https://github.com/keycloak/keycloak/releases/download/$RELEASE/keycloak-$RELEASE.tar.gz" -o "$temp_file"
-#tar xzf $temp_file
-#mv keycloak-$RELEASE /opt/keycloak
-#msg_ok "Installed Keycloak"
-
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/keycloak.service
 [Unit]
@@ -87,7 +63,6 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-#rm -f $temp_file
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"