Skip to content

Commit eb24759

Browse files
committed
bug fix #124
1 parent 8e626b1 commit eb24759

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

ChangeMirrors.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
## Author: SuperManito
3-
## Modified: 2026-01-19
3+
## Modified: 2026-03-04
44
## License: MIT
55
## GitHub: https://github.com/SuperManito/LinuxMirrors
66
## Website: https://linuxmirrors.cn
@@ -2160,7 +2160,7 @@ $(gen_deb "${1}" "${2}-security" "${3}")"
21602160
URIs: ${WEB_PROTOCOL}://${2}/
21612161
Suites: ${3}
21622162
Components: ${4}
2163-
Signed-By: /usr/share/keyrings/${SYSTEM_JUDGMENT,,}-archive-keyring.gpg"
2163+
Signed-By: /usr/share/keyrings/${_DEB22_ARCHIVE_KEYRING:-"${SYSTEM_JUDGMENT,,}-archive-keyring.gpg"}"
21642164
}
21652165
function gen_deb822() {
21662166
echo "$(_template_deb822 "deb" "${1}" "${2}" "${3}")
@@ -2593,9 +2593,11 @@ $(gen_deb "${source_address}" "${base_system_codename}" "${repo_components}")"
25932593
source_address="${SOURCE}/proxmox"
25942594
fi
25952595
if [[ "${USE_DEB822_FORMAT}" == "true" ]]; then
2596+
_DEB22_ARCHIVE_KEYRING="proxmox-archive-keyring.gpg"
25962597
apt_source_file="${File_ProxmoxSources}"
25972598
apt_source_content="$(gen_deb822_unsrc "${source_address}/debian/pve" "${SYSTEM_VERSION_CODENAME}" "pve-no-subscription")"
25982599
write_apt_source
2600+
_DEB22_ARCHIVE_KEYRING=""
25992601
# Ceph 仓库
26002602
if [ -f "${File_ProxmoxCephSources}" ]; then
26012603
local ceph_codename="$(ceph -v | grep ceph | awk '{print $(NF-1)}')"

ChangeMirrorsLite.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
## Author: SuperManito
3-
## Modified: 2026-01-19
3+
## Modified: 2026-03-04
44
## License: MIT
55
## GitHub: https://github.com/SuperManito/LinuxMirrors
66
## Website: https://linuxmirrors.cn
@@ -1586,7 +1586,7 @@ $(gen_deb "${1}" "${2}-security" "${3}")"
15861586
URIs: ${WEB_PROTOCOL}://${2}/
15871587
Suites: ${3}
15881588
Components: ${4}
1589-
Signed-By: /usr/share/keyrings/${SYSTEM_JUDGMENT,,}-archive-keyring.gpg"
1589+
Signed-By: /usr/share/keyrings/${_DEB22_ARCHIVE_KEYRING:-"${SYSTEM_JUDGMENT,,}-archive-keyring.gpg"}"
15901590
}
15911591
function gen_deb822() {
15921592
echo "$(_template_deb822 "deb" "${1}" "${2}" "${3}")
@@ -2019,9 +2019,11 @@ $(gen_deb "${source_address}" "${base_system_codename}" "${repo_components}")"
20192019
source_address="${SOURCE}/proxmox"
20202020
fi
20212021
if [[ "${USE_DEB822_FORMAT}" == "true" ]]; then
2022+
_DEB22_ARCHIVE_KEYRING="proxmox-archive-keyring.gpg"
20222023
apt_source_file="${File_ProxmoxSources}"
20232024
apt_source_content="$(gen_deb822_unsrc "${source_address}/debian/pve" "${SYSTEM_VERSION_CODENAME}" "pve-no-subscription")"
20242025
write_apt_source
2026+
_DEB22_ARCHIVE_KEYRING=""
20252027
# Ceph 仓库
20262028
if [ -f "${File_ProxmoxCephSources}" ]; then
20272029
local ceph_codename="$(ceph -v | grep ceph | awk '{print $(NF-1)}')"

0 commit comments

Comments
 (0)