From f33c292c3ee72fd29b7995dd6fd8a6ac6d299d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?=
 <58952836+tremor021@users.noreply.github.com>
Date: Wed, 30 Jul 2025 15:19:58 +0200
Subject: [PATCH] Refactor (#6374)

---
 ct/komga.sh              | 14 ++++++--------
 install/komga-install.sh | 16 ++++------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/ct/komga.sh b/ct/komga.sh
index 12af24383..4dd884b0a 100644
--- a/ct/komga.sh
+++ b/ct/komga.sh
@@ -27,23 +27,21 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  msg_info "Updating ${APP}"
+
   RELEASE=$(curl -fsSL https://api.github.com/repos/gotson/komga/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
+  if [[ ! -f ~/.komga ]] || [[ "${RELEASE}" != "$(cat ~/.komga)" ]]; then
     msg_info "Stopping ${APP}"
     systemctl stop komga
     msg_ok "Stopped ${APP}"
 
-    msg_info "Updating ${APP} to ${RELEASE}"
-    curl -fsSL "https://github.com/gotson/komga/releases/download/${RELEASE}/komga-${RELEASE}.jar" -o $(basename "https://github.com/gotson/komga/releases/download/${RELEASE}/komga-${RELEASE}.jar")
-    rm -rf /opt/komga/komga.jar
-    mv -f komga-${RELEASE}.jar /opt/komga/komga.jar
-    echo "${RELEASE}" >/opt/${APP}_version.txt
-    msg_ok "Updated ${APP} to ${RELEASE}"
+    rm -f /opt/komga/komga.jar
+    USE_ORIGINAL_FILENAME="true" fetch_and_deploy_gh_release "komga" "gotson/komga" "singlefile" "latest" "/opt/komga" "komga*.jar"
+    mv /opt/komga/komga-*.jar /opt/komga/komga.jar
 
     msg_info "Starting ${APP}"
     systemctl start komga
     msg_ok "Started ${APP}"
+
     msg_ok "Updated Successfully"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}."
diff --git a/install/komga-install.sh b/install/komga-install.sh
index 595a24f7e..5d6cc3a72 100644
--- a/install/komga-install.sh
+++ b/install/komga-install.sh
@@ -13,17 +13,9 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies"
-$STD apt-get install -y openjdk-17-jre
-msg_ok "Installed Dependencies"
-
-msg_info "Installing Komga"
-RELEASE=$(curl -fsSL https://api.github.com/repos/gotson/komga/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-curl -fsSL "https://github.com/gotson/komga/releases/download/${RELEASE}/komga-${RELEASE}.jar" -o "komga-${RELEASE}.jar"
-mkdir -p /opt/komga
-mv -f komga-${RELEASE}.jar /opt/komga/komga.jar
-echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt"
-msg_ok "Installed Komga"
+JAVA_VERSION="21" setup_java
+USE_ORIGINAL_FILENAME="true" fetch_and_deploy_gh_release "komga" "gotson/komga" "singlefile" "latest" "/opt/komga" "komga*.jar"
+mv /opt/komga/komga-*.jar /opt/komga/komga.jar
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/komga.service
@@ -42,7 +34,7 @@ Restart=on-failure
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable --now -q komga
+systemctl enable -q --now komga
 msg_ok "Created Service"
 
 motd_ssh