From c4afe3349b7519a879f9e7ac392e7f760789e998 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, 17 Dec 2025 16:34:36 +0100
Subject: [PATCH] Refactor (#10057)

---
 ct/salt.sh              |  8 +++-----
 install/salt-install.sh | 17 +++++++----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/ct/salt.sh b/ct/salt.sh
index 7f0b45fe7..82ccd6029 100644
--- a/ct/salt.sh
+++ b/ct/salt.sh
@@ -29,16 +29,14 @@ function update_script() {
     exit
   fi
 
-  RELEASE=$(curl -fsSL https://api.github.com/repos/saltstack/salt/releases/latest | jq -r .tag_name | sed 's/^v//')
-  if [[ ! -f /~.salt ]] || [[ "${RELEASE}" != "$(cat /~.salt)" ]]; then
-    msg_info "Updating $APP to ${RELEASE}"
+  RELEASE=$(get_latest_github_release "saltstack/salt")
+  if check_for_gh_release "salt" "saltstack/salt"; then
+    msg_info "Updating Salt"
     sed -i "s/^\(Pin: version \).*/\1${RELEASE}/" /etc/apt/preferences.d/salt-pin-1001
     $STD apt update
     $STD apt upgrade -y
     echo "${RELEASE}" >/~.salt
     msg_ok "Updated successfully!"
-  else
-    msg_ok "${APP} is already up to date (${RELEASE})"
   fi
   exit
 }
diff --git a/install/salt-install.sh b/install/salt-install.sh
index 54dbe8aed..87ef3c7cc 100644
--- a/install/salt-install.sh
+++ b/install/salt-install.sh
@@ -13,19 +13,16 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies"
-$STD apt install -y jq
-msg_ok "Installed Dependencies"
-
-msg_info "Setup Salt Repo"
-mkdir -p /etc/apt/keyrings
-curl -fsSL https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public -o /etc/apt/keyrings/salt-archive-keyring.pgp
-curl -fsSL https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.sources -o /etc/apt/sources.list.d/salt.sources
-$STD apt update
+msg_info "Setting up Salt Repo"
+setup_deb822_repo \
+  "salt" \
+  "https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public" \
+  "https://packages.broadcom.com/artifactory/saltproject-deb" \
+  "stable"
 msg_ok "Setup Salt Repo"
 
 msg_info "Installing Salt"
-RELEASE=$(curl -fsSL https://api.github.com/repos/saltstack/salt/releases/latest | jq -r .tag_name | sed 's/^v//')
+RELEASE=$(get_latest_github_release "saltstack/salt")
 cat <<EOF >/etc/apt/preferences.d/salt-pin-1001
 Package: salt-*
 Pin: version ${RELEASE}