From 1fe00c2493d35a7a07d00b98edd79a1050815c0a Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Thu, 23 Oct 2025 06:46:28 -0700
Subject: [PATCH] Refactor: Kavita + Updated tools.func (no-same-owner) (#8594)

---
 ct/kavita.sh                     | 41 ++++++++++++++++++--------------
 frontend/public/json/kavita.json |  2 +-
 install/kavita-install.sh        | 22 ++++++++---------
 misc/tools.func                  |  4 ++--
 4 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/ct/kavita.sh b/ct/kavita.sh
index 55beaff81..5011c9e56 100644
--- a/ct/kavita.sh
+++ b/ct/kavita.sh
@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-2048}"
 var_disk="${var_disk:-8}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -20,23 +20,28 @@ color
 catch_errors
 
 function update_script() {
-    header_info
-    check_container_storage
-    check_container_resources
-    if [[ ! -d /opt/Kavita ]]; then
-        msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-    msg_info "Updating $APP LXC"
-    systemctl stop kavita
-    RELEASE=$(curl -fsSL https://api.github.com/repos/Kareadita/Kavita/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-    $STD tar -xvzf <(curl -fsSL https://github.com/Kareadita/Kavita/releases/download/$RELEASE/kavita-linux-x64.tar.gz) --no-same-owner
-    rm -rf Kavita/config
-    cp -r Kavita/* /opt/Kavita
-    rm -rf Kavita
-    systemctl start kavita
-    msg_ok "Updated $APP LXC"
+  header_info
+  check_container_storage
+  check_container_resources
+  if [[ ! -d /opt/Kavita ]]; then
+    msg_error "No ${APP} Installation Found!"
     exit
+  fi
+
+  if check_for_gh_release "kavita" "Kareadita/Kavita"; then
+    msg_info "Stopping Service"
+    systemctl stop kavita
+    msg_ok "Service Stopped"
+
+    fetch_and_deploy_gh_release "kavita" "Kareadita/Kavita" "prebuild" "latest" "/opt/Kavita" "kavita-linux-x64.tar.gz"
+    chmod +x /opt/Kavita/Kavita && chown root:root /opt/Kavita/Kavita
+
+    msg_info "Starting Service"
+    systemctl start kavita
+    msg_ok "Service Started"
+    msg_ok "Update Successfully!"
+  fi
+  exit
 }
 
 start
@@ -46,4 +51,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:5000${CL}"
\ No newline at end of file
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:5000${CL}"
diff --git a/frontend/public/json/kavita.json b/frontend/public/json/kavita.json
index 3b6d255d4..2dc33fa35 100644
--- a/frontend/public/json/kavita.json
+++ b/frontend/public/json/kavita.json
@@ -23,7 +23,7 @@
         "ram": 2048,
         "hdd": 8,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],
diff --git a/install/kavita-install.sh b/install/kavita-install.sh
index 0c2b1a059..985140eb7 100644
--- a/install/kavita-install.sh
+++ b/install/kavita-install.sh
@@ -13,15 +13,11 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Kavita"
-cd /opt
-RELEASE=$(curl -fsSL https://api.github.com/repos/Kareadita/Kavita/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-$STD tar -xvzf <(curl -fsSL https://github.com/Kareadita/Kavita/releases/download/$RELEASE/kavita-linux-x64.tar.gz) --no-same-owner
-msg_ok "Installed Kavita"
+fetch_and_deploy_gh_release "Kavita" "Kareadita/Kavita" "prebuild" "latest" "/opt/Kavita" "kavita-linux-x64.tar.gz"
 
 msg_info "Creating Service"
-service_path="/etc/systemd/system/kavita.service"
-echo "[Unit]
+cat <<EOF >/etc/systemd/system/kavita.service
+[Unit]
 Description=Kavita Server
 After=network.target
 
@@ -34,15 +30,17 @@ KillMode=process
 Restart=on-failure
 
 [Install]
-WantedBy=multi-user.target" >$service_path
-chmod +x /opt/Kavita/* && chown root /opt/Kavita/*
-systemctl enable --now -q kavita.service
+WantedBy=multi-user.target
+EOF
+chmod +x /opt/Kavita/Kavita && chown root:root /opt/Kavita/Kavita
+systemctl enable -q --now kavita
 msg_ok "Created Service"
 
 motd_ssh
 customize
 
 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
diff --git a/misc/tools.func b/misc/tools.func
index 87f8e32d1..05604d51d 100644
--- a/misc/tools.func
+++ b/misc/tools.func
@@ -1141,7 +1141,7 @@ function fetch_and_deploy_gh_release() {
       rm -rf "${target:?}/"*
     fi
 
-    tar -xzf "$tmpdir/$filename" -C "$tmpdir" || {
+  tar --no-same-owner -xzf "$tmpdir/$filename" -C "$tmpdir" || {
       msg_error "Failed to extract tarball"
       rm -rf "$tmpdir"
       return 1
@@ -1263,7 +1263,7 @@ function fetch_and_deploy_gh_release() {
         return 1
       }
     elif [[ "$filename" == *.tar.* || "$filename" == *.tgz ]]; then
-      tar -xf "$tmpdir/$filename" -C "$unpack_tmp" || {
+      tar --no-same-owner -xf "$tmpdir/$filename" -C "$unpack_tmp" || {
         msg_error "Failed to extract TAR archive"
         rm -rf "$tmpdir" "$unpack_tmp"
         return 1