tools.func: never delete ubuntu.sources (or other distro base sources) as orphaned

2026-08-04 14:52:12 +02:00 · 2026-08-04 11:35:17 +02:00
3 changed files with 5 additions and 12 deletions
@@ -518,14 +518,6 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit

 </details>

-## 2026-08-04
-
-### 🚀 Updated Scripts
-
-  - #### 🐞 Bug Fixes
-
-    - Passbolt: fetch GPG key from Passbolt's own host instead of the flaky keyserver [@MickLesk](https://github.com/MickLesk) ([#16248](https://github.com/community-scripts/ProxmoxVE/pull/16248))
-
 ## 2026-08-03

 ### 🚀 Updated Scripts
@@ -26,7 +26,7 @@ create_self_signed_cert

 setup_deb822_repo \
  "passbolt" \
-  "https://download.passbolt.com/pub.key" \
+  "https://keys.openpgp.org/pks/lookup?op=get&options=mr&search=0x3D1A0346C8E1802F774AEF21DE8B853FC155581D" \
  "https://download.passbolt.com/ce/debian" \
  "buster" \
  "stable"
@@ -2040,8 +2040,9 @@ cleanup_orphaned_sources() {
    local basename_file
    basename_file=$(basename "$sources_file")

-    # NEVER remove debian.sources - this is the standard Debian repository
-    if [[ "$basename_file" == "debian.sources" ]]; then
+    # NEVER remove the distro's own base sources file (debian.sources,
+    # ubuntu.sources, ...)
+    if [[ "$basename_file" == "$(get_os_info id).sources" ]]; then
      continue
    fi

@@ -2113,7 +2114,7 @@ ensure_apt_working() {
      # Step 4: More aggressive - remove all third-party sources
      msg_warn "APT update still failing, removing third-party sources"
      find /etc/apt/sources.list.d/ -type f \( -name "*.sources" -o -name "*.list" \) \
-        ! -name "debian.sources" -delete 2>/dev/null || true
+        ! -name "$(get_os_info id).sources" -delete 2>/dev/null || true

      # Final attempt
      if ! $STD apt update; then