Refactor (#10303)

ct/ntfy.sh

@@ -34,21 +34,18 @@ function update_script() {
     rm -f /etc/apt/sources.list.d/archive.heckel.io.list
     rm -f /etc/apt/sources.list.d/archive.heckel.io.list.bak
     rm -f /etc/apt/sources.list.d/archive.heckel.io.sources
-    curl -fsSL -o /etc/apt/keyrings/ntfy.gpg https://archive.ntfy.sh/apt/keyring.gpg
+    setup_deb822_repo \
-    cat <<'EOF' >/etc/apt/sources.list.d/ntfy.sources
+      "ntfy" \
-Types: deb
+      "https://archive.ntfy.sh/apt/keyring.gpg" \
-URIs: https://archive.ntfy.sh/apt/
+      "https://archive.ntfy.sh/apt/" \
-Suites: stable
+      "stable"
-Components: main
-Signed-By: /etc/apt/keyrings/ntfy.gpg
-EOF
     msg_ok "Corrected old Ntfy Repository"
   fi
 
-  msg_info "Updating $APP LXC"
+  msg_info "Updating ntfy"
   $STD apt update
-  $STD apt -y upgrade
+  $STD apt upgrade -y
-  msg_ok "Updated $APP LXC"
+  msg_ok "Updated ntfy"
   msg_ok "Updated successfully!"
   exit
 }

install/ntfy-install.sh

@@ -13,21 +13,15 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing ntfy"
+msg_info "Setting up ntfy"
-mkdir -p /etc/apt/keyrings
+setup_deb822_repo \
-curl -fsSL -o /etc/apt/keyrings/ntfy.gpg https://archive.ntfy.sh/apt/keyring.gpg
+  "ntfy" \
-cat <<EOF >/etc/apt/sources.list.d/ntfy.sources
+  "https://archive.ntfy.sh/apt/keyring.gpg" \
-Types: deb
+  "https://archive.ntfy.sh/apt/" \
-URIs: https://archive.ntfy.sh/apt/
+  "stable"
-Suites: stable
-Components: main
-Signed-By: /etc/apt/keyrings/ntfy.gpg
-EOF
-
-$STD apt update
 $STD apt install -y ntfy
 systemctl enable -q --now ntfy
-msg_ok "Installed ntfy"
+msg_ok "Setup ntfy"
 
 motd_ssh
 customize