From afd577db9e849376984103b0b626e72ee9b642c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?=
 <58952836+tremor021@users.noreply.github.com>
Date: Fri, 1 Aug 2025 07:24:33 +0200
Subject: [PATCH] Refactor (#6421)

---
 ct/oauth2-proxy.sh              | 22 +++++++---------------
 install/oauth2-proxy-install.sh | 16 +---------------
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/ct/oauth2-proxy.sh b/ct/oauth2-proxy.sh
index f6cfe77dc..0e0dd2c47 100644
--- a/ct/oauth2-proxy.sh
+++ b/ct/oauth2-proxy.sh
@@ -30,26 +30,18 @@ function update_script() {
   fi
 
   RELEASE=$(curl -fsSL https://api.github.com/repos/oauth2-proxy/oauth2-proxy/releases/latest | jq -r .tag_name | sed 's/^v//')
-  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
+  if [[ ! -f ~/.oauth2-proxy ]] || [[ "${RELEASE}" != "$(cat ~/.oauth2-proxy)" ]]; then
     msg_info "Stopping ${APP} services"
     systemctl stop oauth2-proxy
-    msg_ok "Stopped ${APP}"
+    msg_ok "Stopped ${APP} service"
 
-    msg_info "Updating $APP to ${RELEASE}"
-    rm -f /opt/oauth2-proxy/oauth2-proxy
-    curl -fsSL "https://github.com/oauth2-proxy/oauth2-proxy/releases/download/v${RELEASE}/oauth2-proxy-v${RELEASE}.linux-amd64.tar.gz" -o /opt/oauth2-proxy.tar.gz
-    tar -xzf /opt/oauth2-proxy.tar.gz
-    mv /opt/oauth2-proxy-v${RELEASE}.linux-amd64/oauth2-proxy /opt/oauth2-proxy
+    fetch_and_deploy_gh_release "oauth2-proxy" "oauth2-proxy/oauth2-proxy" "prebuild" "latest" "/opt/oauth2-proxy" "oauth2-proxy*linux-amd64.tar.gz"
+
+    msg_info "Starting ${APP} service"
     systemctl start oauth2-proxy
-    echo "${RELEASE}" >/opt/${APP}_version.txt
-    msg_ok "Updated ${APP} to ${RELEASE}"
+    msg_ok "Started ${APP} service"
 
-    msg_info "Cleaning up"
-    rm -f "/opt/oauth2-proxy.tar.gz"
-    rm -rf "/opt/oauth2-proxy-v${RELEASE}.linux-amd64"
-    $STD apt-get -y autoremove
-    $STD apt-get -y autoclean
-    msg_ok "Cleaned"
+    msg_ok "Updated successfully!\n"
   else
     msg_ok "${APP} is already up to date (${RELEASE})"
   fi
diff --git a/install/oauth2-proxy-install.sh b/install/oauth2-proxy-install.sh
index 3ed3fecea..45ee11481 100644
--- a/install/oauth2-proxy-install.sh
+++ b/install/oauth2-proxy-install.sh
@@ -13,20 +13,8 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies"
-$STD apt-get install -y \
-  jq
-msg_ok "Installed Dependencies"
-
-msg_info "Setup OAuth2-Proxy"
-RELEASE=$(curl -fsSL https://api.github.com/repos/oauth2-proxy/oauth2-proxy/releases/latest | jq -r .tag_name | sed 's/^v//')
-mkdir -p /opt/oauth2-proxy
-curl -fsSL "https://github.com/oauth2-proxy/oauth2-proxy/releases/download/v${RELEASE}/oauth2-proxy-v${RELEASE}.linux-amd64.tar.gz" -o /opt/oauth2-proxy.tar.gz
-tar -xzf /opt/oauth2-proxy.tar.gz -C /opt
-mv /opt/oauth2-proxy-v${RELEASE}.linux-amd64/oauth2-proxy /opt/oauth2-proxy
+fetch_and_deploy_gh_release "oauth2-proxy" "oauth2-proxy/oauth2-proxy" "prebuild" "latest" "/opt/oauth2-proxy" "oauth2-proxy*linux-amd64.tar.gz"
 touch /opt/oauth2-proxy/config.toml
-echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
-msg_ok "Setup OAuth2-Proxy"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/oauth2-proxy.service
@@ -51,8 +39,6 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -f "/opt/oauth2-proxy.tar.gz"
-rm -rf "/opt/oauth2-proxy-v${RELEASE}.linux-amd64"
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"