From 21c2ef291500c8f0acdb7206e463d3ff36d2fd36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?=
 <58952836+tremor021@users.noreply.github.com>
Date: Thu, 14 Aug 2025 14:15:24 +0200
Subject: [PATCH] Refactor (#6822)

---
 ct/zot-registry.sh              | 20 ++++++++++++--------
 install/zot-registry-install.sh | 11 ++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ct/zot-registry.sh b/ct/zot-registry.sh
index a57223559..29ce1c992 100644
--- a/ct/zot-registry.sh
+++ b/ct/zot-registry.sh
@@ -23,25 +23,29 @@ function update_script() {
   header_info
   check_container_storage
   check_container_resources
-
   if [[ ! -f /usr/bin/zot ]]; then
     msg_error "No ${APP} installation found!"
     exit
   fi
 
-  RELEASE=$(curl -fsSL https://api.github.com/repos/project-zot/zot/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}')
+  RELEASE=$(curl -fsSL https://api.github.com/repos/project-zot/zot/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4)}')
   if [[ ! -f ~/.${APP} ]] || [[ "${RELEASE}" != "$(cat ~/.${APP})" ]]; then
     msg_info "Stopping Zot service"
     systemctl stop zot
     msg_ok "Stopped Zot service"
 
-    msg_info "Updating Zot to ${RELEASE}"
-    curl -fsSL "https://github.com/project-zot/zot/releases/download/${RELEASE}/zot-linux-amd64" -o /usr/bin/zot
-    chmod +x /usr/bin/zot
+    rm -f /usr/bin/zot
+    fetch_and_deploy_gh_release "zot" "project-zot/zot" "singlefile" "latest" "/usr/bin" "zot-linux-amd64"
+
+    msg_info "Configuring Zot Registry"
     chown root:root /usr/bin/zot
-    echo "${RELEASE}" >~/.${APP}
-    systemctl restart zot
-    msg_ok "Updated Zot to ${RELEASE}"
+    msg_ok "Configured Zot Registry"
+
+    msg_info "Starting service"
+    systemctl start zot
+    msg_ok "Service started"
+
+    msg_ok "Updated successfuly"
   else
     msg_ok "Zot is already up to date (${RELEASE})"
   fi
diff --git a/install/zot-registry-install.sh b/install/zot-registry-install.sh
index beaf3ea91..626d2993f 100644
--- a/install/zot-registry-install.sh
+++ b/install/zot-registry-install.sh
@@ -17,11 +17,9 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y apache2-utils
 msg_ok "Installed Dependencies"
 
-msg_info "Installing Zot Registry"
-RELEASE=$(curl -fsSL https://api.github.com/repos/project-zot/zot/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-curl -fsSL "https://github.com/project-zot/zot/releases/download/${RELEASE}/zot-linux-amd64" -o /usr/bin/zot
-chmod +x /usr/bin/zot
-chown root:root /usr/bin/zot
+fetch_and_deploy_gh_release "zot" "project-zot/zot" "singlefile" "latest" "/usr/bin" "zot-linux-amd64"
+
+msg_info "Configuring Zot Registry"
 mkdir -p /etc/zot
 curl -fsSL https://raw.githubusercontent.com/project-zot/zot/refs/heads/main/examples/config-ui.json -o /etc/zot/config.json
 ZOTPASSWORD=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
@@ -31,8 +29,7 @@ $STD htpasswd -b -B -c /etc/zot/htpasswd admin "$ZOTPASSWORD"
   echo "Zot User: admin"
   echo "Zot Password: $ZOTPASSWORD"
 } >>~/zot.creds
-echo "${RELEASE}" >~/.${APPLICATION}
-msg_ok "Installed Zot Registry"
+msg_ok "Configured Zot Registry"
 
 msg_info "Setup Service"
 cat <<EOF >/etc/systemd/system/zot.service