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

CHANGELOG.md

@@ -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

ct/headers/hister

@@ -1,6 +0,0 @@
-    __  ___      __           
-   / / / (_)____/ /____  _____
-  / /_/ / / ___/ __/ _ \/ ___/
- / __  / (__  ) /_/  __/ /    
-/_/ /_/_/____/\__/\___/_/     
-                              

ct/hister.sh

@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: MickLesk (CanbiZ)
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/asciimoo/hister
-
-APP="Hister"
-var_tags="${var_tags:-search;browser-history;personal}"
-var_cpu="${var_cpu:-1}"
-var_ram="${var_ram:-1024}"
-var_disk="${var_disk:-20}"
-var_os="${var_os:-debian}"
-var_version="${var_version:-13}"
-var_arm64="${var_arm64:-yes}"
-var_unprivileged="${var_unprivileged:-1}"
-
-header_info "$APP"
-variables
-color
-catch_errors
-
-function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-
-  if [[ ! -f /usr/local/bin/hister ]]; then
-    msg_error "No ${APP} Installation Found!"
-    exit
-  fi
-
-  if check_for_gh_release "hister" "asciimoo/hister"; then
-    msg_info "Stopping Service"
-    systemctl stop hister
-    msg_ok "Stopped Service"
-
-    ARCH=$(dpkg --print-architecture)
-    fetch_and_deploy_gh_release "hister" "asciimoo/hister" "singlefile" "latest" "/usr/local/bin" "hister_*_linux_${ARCH}"
-
-    msg_info "Starting Service"
-    systemctl start hister
-    msg_ok "Started Service"
-    msg_ok "Updated successfully!"
-  fi
-  exit
-}
-
-start
-build_container
-description
-
-msg_ok "Completed Successfully!\n"
-echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
-echo -e "${INFO}${YW}Access it using the following URL:${CL}"
-echo -e "${GATEWAY}${BGN}http://${IP}:4433${CL}"

install/hister-install.sh

@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: MickLesk (CanbiZ)
-# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://github.com/asciimoo/hister
-
-source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
-color
-verb_ip6
-catch_errors
-setting_up_container
-network_check
-update_os
-
-ARCH=$(dpkg --print-architecture)
-fetch_and_deploy_gh_release "hister" "asciimoo/hister" "singlefile" "latest" "/usr/local/bin" "hister_*_linux_${ARCH}"
-
-msg_info "Configuring Hister"
-mkdir -p /opt/hister/data /etc/hister
-LOCAL_IP=$(hostname -I | awk '{print $1}')
-cat <<EOF >/etc/hister/config.yaml
-app:
-  directory: '/opt/hister/data'
-server:
-  address: '0.0.0.0:4433'
-  base_url: 'http://${LOCAL_IP}:4433'
-EOF
-msg_ok "Configured Hister"
-
-msg_info "Creating Service"
-cat <<EOF >/etc/systemd/system/hister.service
-[Unit]
-Description=Hister Search Engine
-After=network.target
-
-[Service]
-Type=simple
-User=root
-ExecStart=/usr/local/bin/hister listen --config /etc/hister/config.yaml
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
-EOF
-systemctl enable -q --now hister
-msg_ok "Created Service"
-
-motd_ssh
-customize
-cleanup_lxc

install/passbolt-install.sh

@@ -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"

misc/tools.func

@@ -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