From 9ec1c88ada62bda73f8ecaf47ebc19fdde987932 Mon Sep 17 00:00:00 2001
From: hl <hanlu@tink.ltd>
Date: Mon, 4 Nov 2024 05:30:42 +0800
Subject: [PATCH] update

---
 init.sh | 50 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/init.sh b/init.sh
index 9b1e94b..db9dde2 100755
--- a/init.sh
+++ b/init.sh
@@ -72,23 +72,21 @@ Components: main contrib non-free non-free-firmware
 Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
 Architectures: $OS_ARCH
 
-Enabled: yes
-Types: deb-src
+Types: deb
 URIs: $SEC_URL
 Suites: $OS_CODE-security
 Components: main contrib non-free non-free-firmware
 Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+Architectures: $OS_ARCH
 " | tee /etc/apt/sources.list.d/debian.sources
 
-#    echo -e "deb $MIRROR_URL $OS_CODE main contrib non-free non-free-firmware
-#deb $MIRROR_URL $OS_CODE-updates main contrib non-free non-free-firmware
-#deb $MIRROR_URL $OS_CODE-backports main contrib non-free non-free-firmware
-#deb $SEC_URL $OS_CODE-security main contrib non-free non-free-firmware
-#" | tee /etc/apt/sources.list
-
     if [ $FOR_PVE -eq 1 ]; then
-        echo "deb $PVE_URL bookworm pve-no-subscription" | \
-            tee /etc/apt/sources.list.d/pve-no-subscription.list
+        echo -e "Types: deb
+URIs: $PVE_URL
+Suites: $OS_CODE
+Components: pve-no-subscription
+Signed-By: /usr/share/keyrings/proxmox-offline-signing-key.pub
+" | tee /etc/apt/sources.list.d/pve-no-subscription.sources
     fi
 
     command="nala"
@@ -100,23 +98,35 @@ Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
     if [[ $OS_VERSION=="12" ]]; then
         OS_VERSION="Testing"
     fi
-    echo "deb http://download.opensuse.org/repositories/shells:/zsh-users:/zsh-completions/Debian_$OS_VERSION/ /" | \
-        tee /etc/apt/sources.list.d/shells:zsh-users:zsh-completions.list
+
+    echo -e "Types: deb
+URIs: http://download.opensuse.org/repositories/shells:/zsh-users:/zsh-completions/Debian_$OS_VERSION/
+Suites: /
+Signed-By: /etc/apt/trusted.gpg.d/shells_zsh-users_zsh-completions.gpg
+" | tee /etc/apt/sources.list.d/zsh-completions.sources
     curl -fsSL "https://download.opensuse.org/repositories/shells:zsh-users:zsh-completions/Debian_$OS_VERSION/Release.key" | \
         gpg --dearmor | tee /etc/apt/trusted.gpg.d/shells_zsh-users_zsh-completions.gpg > /dev/null
 
 
-    if [ $FOR_PVE -eq 1 ]; then
-        rm /etc/apt/sources.list.d/docker.list || true
-        rm /etc/apt/sources.list.d/azlux.list || true
-    else
-        echo "deb [arch=$OS_ARCH] $DOCKER_URL $OS_CODE stable" | \
-            tee /etc/apt/sources.list.d/docker.list
+    if [ $FOR_PVE -eq 0 ]; then
+        echo -e "Types: deb
+URIs: $DOCKER_URL
+Suites: $OS_CODE
+Components: stable
+Signed-By: /etc/apt/trusted.gpg.d/docker.gpg
+Architectures: $OS_ARCH
+" | tee /etc/apt/sources.list.d/docker.sources
         curl -fsSL "https://download.docker.com/linux/debian/gpg" | \
             gpg --dearmor | tee /etc/apt/trusted.gpg.d/docker.gpg > /dev/null
 
-        echo "deb [arch=$OS_ARCH] http://packages.azlux.fr/debian $OS_CODE main" | \
-            tee /etc/apt/sources.list.d/azlux.list
+        #For docker-ctop
+        echo -e "Types: deb
+URIs: http://packages.azlux.fr/debian
+Suites: $OS_CODE
+Components: main
+Signed-By: /etc/apt/trusted.gpg.d/azlux-archive-keyring.gpg
+Architectures: $OS_ARCH
+" | tee /etc/apt/sources.list.d/azlux.sources
         curl -fsSL "https://azlux.fr/repo.gpg.key" | \
             gpg --dearmor | tee /etc/apt/trusted.gpg.d/azlux-archive-keyring.gpg > /dev/null
     fi