mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-10-31 21:18:08 +00:00
149fb56e8c
- `.github/workflows/ci.yml` added as a new workflow: job `lint-and-test` on `runs-on: ubuntu-latest` with `container: debian:trixie`, checking out via `actions/checkout@v4`, installing `bats` and `shellcheck`, running `shellcheck --severity=error debianito.sh modules/**/*.sh` (with `shopt -s globstar`) and `bats tests/`.
- `debianito.sh` CLI parser: `AUTO_YES=0`, `ALLOW_DESTRUCTIVE=0` declared after `MODULES_DIR` and before `_boot_mark`; `_usage()` prints `Usage: debianito.sh [OPTIONS]` with `--yes`, `--allow-destructive` and `--help`; the `while [ $# -gt 0 ]` / `case` loop consumes `--yes` and `--allow-destructive`, prints `Unknown option: $1 (run with --help for usage)` to stderr and `exit 2` for unknown flags, and `--help|-h` runs `_usage` then `exit 0`.
- `modules/utils.sh`: new global `_SELECTION_CONFIRMED=0` and `_confirm_install_list()` (utils.sh:756-785), which renders items capped at 15 with `... and N more`, computes `height` capped at 24, calls `_confirm "$title" "$list" "$height" 65`, arms `_SELECTION_CONFIRMED=${#items[@]}` on yes, and returns 1 for an empty list or on decline. `_install_pkg()` (utils.sh:789-804) decrements the countdown instead of prompting, and only prompts via `elif ! _confirm "Install: ${pkg}" "Install ${pkg}\nVersion: ${ver}?"; then return 0`.
- Bulk retrofit in `modules/extras/**/*.sh` (18 sites): `_confirm_install_list "Título" "${array[@]}" || return` placed right after the `whiptail` selection is parsed, the install loop left intact, and `_SELECTION_CONFIRMED=0` after the loop. Files: office/office.sh:101, system/software_centers.sh:29, system/system.sh:133, communication/communication.sh:68, design/design.sh:42, download/download.sh:48+55, terminals/terminals.sh:31, security/security.sh:30, players/players.sh:20, themes/fonts/fonts.sh:32, dev/dev.sh:44, programming/programming.sh:57, themes/desktop-themes/desktop-themes.sh:30, fetch/fetch.sh:41, themes/icons/icons.sh:47, themes/cursors/cursors.sh:28, internet/internet.sh:197, java.
- `modules/bullseye/extras.sh` (13 sites) plus `modules/bullseye/legacy.sh` (1 site, `install_gaming_bullseye`, guarded with `if [ ${#_install_pkgs[@]} -gt 0 ]` so a i386-only selection does not blank the summary) plus `modules/desktop_display.sh` (1 site, XFCE Custom — a no-loop `_run_cmd` batch with the reset immediately after it). Special cases: download.sh and bullseye/download each have two checklists merged into one combined summary; legacy.sh gaming skips the reset when the list is empty; XFCE Custom resets before `_xfce_polkit_rules` so the counter cannot leak.
- `modules/desktops/desktop_gnome.sh` (new): `gnome_menu()` runs a `_radiolist` with "1" "GNOME (Full Desktop)", "2" "GNOME Core (Minimal Install)", "3" "Back", then `_install_gnome_full()` and `_install_gnome_core()`. Each arms `_confirm_install_list "GNOME Full Desktop" gnome gdm3 || return` (core: `gnome-core gdm3`), keeps an already-configured display manager via `_existing_display_manager` by setting `target_dm="$keep_dm"`, writes the preseed `echo "${target_dm} shared/default-x-display-manager select ${target_dm}" | sudo debconf-set-selections`, installs `sudo apt install -y gnome gdm3` / `gnome-core gdm3`, enables `gdm3` only when `target_dm = "gdm3"`, resets `_SELECTION_CONFIRMED=0` and calls `_offer_pipewire_after_desktop`.
- `modules/desktops/desktop_kde.sh` (new): `kde_menu()` runs a `_radiolist` with "1" "KDE Plasma (Full Desktop)", "2" "KDE Plasma Desktop (Minimal)", "3" "Back"; `_install_kde_full()` and `_install_kde_minimal()` arm `_confirm_install_list "KDE Plasma Full" kde-standard sddm || return` (minimal: `kde-plasma-desktop sddm`), preseed `sddm shared/default-x-display-manager select sddm`, install `sudo apt install -y kde-standard sddm` / `kde-plasma-desktop sddm`, enable `sddm` only when it is the target DM, reset the counter and offer PipeWire.
- `modules/desktop_display.sh` `desktop_environment_menu()`: `env_items+=("3" "GNOME")`, `env_items+=("4" "KDE Plasma")`, `env_items+=("5" "Back")`; the case adds `3)` loading `gnome` via `_load_module gnome || continue` and calling `gnome_menu`, and `4)` loading `kde` via `_load_module kde || continue` and calling `kde_menu`; the dead TODO comment was removed.
- PipeWire retrofit in `modules/desktop_display.sh` (6 sites): `_install_lxde_full`, `_install_lxde_core`, `_install_xfce_full`, `_install_xfce_minimal`, `_install_xfce_wayland` and `_install_xfce_custom` each call `_offer_pipewire_after_desktop` after their install block.
- `_offer_pipewire_after_desktop()` and `_existing_display_manager()` added at the end of `modules/desktop_display.sh`: `_offer_pipewire_after_desktop` checks `pipewire-audio` (`pipewire` when `DEBIAN_VERSION = 11`), returns 0 via `is_installed`, otherwise `_confirm "PipeWire Audio" "No PipeWire audio server is installed.\n\nInstall the PipeWire audio stack (recommended)?"` calls `_install_pipewire_standard` and returns 0. `_existing_display_manager` reads `${DM_FILE:-/etc/X11/default-display-manager}`, reads the basename as the DM, and otherwise scans `gdm3 lightdm sddm greetd gdm` with `systemctl is-enabled`, printing nothing when none is found.
- `_ensure_apt_updated` added before the GNOME/KDE `apt install` transactions (4 sites, deduplicated per session); `gnome gdm3` and `kde-standard sddm` are installed alongside even when another display manager is kept as the default.
- Extraction to `modules/desktops/`: `desktop_lxde.sh` (38 lines) and `desktop_xfce.sh` (119 lines) created with the `lxde_menu` / `_install_lxde_full` / `_install_lxde_core` and `xfce_menu` / `_install_xfce_full` / `_install_xfce_minimal` / `_install_xfce_wayland` / `_install_xfce_custom` / `_xfce_polkit_rules` blocks moved verbatim; both carry `# License GPL v3` in their headers.
- `modules/desktop_display.sh` reduced from 542 to 394 lines (−154): lines 55-208 removed, the dispatch (desktop_display.sh:39-46) replaced with `_load_module xfce || continue` / `lxde_menu`, and the file left with `manage_desktop_display`, `desktop_environment_menu`, `display_manager_menu`, `lightdm_config_menu`, `configure_greetd`, `configure_gdm3`, `configure_sddm`, the two shared helpers.
- `modules/utils.sh` `_load_module` map: `xfce)` → `${MODULES_DIR}/desktops/desktop_xfce.sh`, `lxde)` → `${MODULES_DIR}/desktops/desktop_lxde.sh`, `gnome)` → `${MODULES_DIR}/desktops/desktop_gnome.sh`, `kde)` → `${MODULES_DIR}/desktops/desktop_kde.sh`; deps for `xfce`, `lxde`, `gnome` and `kde` are `(desktop_display audio)` and `desktop_display` is `(repos audio)`.
- `modules/desktops/desktop_xfce.sh` `_xfce_polkit_rules()` writes `/etc/polkit-1/rules.d/85-suspend.rules` and `89-backlight.rules` via `sudo tee`, adds the `backlight` group with `groupadd --system` fallback, adds the real login user from `/etc/passwd` to `backlight` and restarts `polkit.service`.
- ES→EN user-facing strings: 14 strings across 4 files — `desktop_display.sh` `lxdе_menu` ("LXDE (Full Desktop)", "LXDE Core (Minimal Install)"), `gpu/nvidia.sh` Kepler legacy-driver notice ("Kepler GPU detected (GKxxx)… Install the legacy driver for Kepler?"), `bullseye/legacy.sh` ("Install NVIDIA driver?", "Skipping NVIDIA driver.", "Installing NVIDIA driver ${gpu_gen}...") and `bullseye/extras.sh` ("firmware-linux-nonfree provides drivers for… Install?").
- ES→EN internal comments: ~35 comments across 9 files — section headers in `_install_nvidia_standard`, `gpu/_helpers.sh` (lines 5, 113), `gpu/nvidia.sh` (lines 8-12, 19-22, 68-70, 167-172, 196, 239-253, 262-263, 275, 291, 336-338, 376), `gpu.sh` (lines 15-17), `bullseye/repos.sh` (line 2), `firmware.sh` (line 235, "--- Load verification ---"), `utils.sh` (lines 129, 132, 153 — timezone Paso 1/2/4) and `utils.sh:546,548`.
- set -e abort fix: `debianito.sh:149` now reads `_system_preferences_menu || true`, consistent with the other dispatch chains (14 of the 15 chains already had the guard); a declined pre-apply summary now leaves the TUI alive instead of terminating the script.
- `docs/desktops_display.md`: 4 hunks — intro now lists GNOME/GNOME Core/KDE Plasma/KDE Plasma Desktop/XFCE/XFCE Wayland/XFCE Custom/LXDE, a new "Modular layout" paragraph describing `modules/desktops/` and lazy loading, Block 1 rewritten into four environments, five new bullets (pre-apply summary, existing-DM preservation, PipeWire offer, stale-lists guard) and a Desktop Environment Packages table.
- `docs/quickstart.md` line 284: Desktop Environment entry expanded to pick from XFCE (full / minimal / Wayland `labwc` on Trixie / custom checklist), LXDE (full / core), GNOME (full / core) or KDE Plasma (full / minimal).
- `_existing_display_manager` now takes the config path via `local dm_file="${DM_FILE:-/etc/X11/default-display-manager}"` so the offline test suite never reads the real system file.
- `tests/test_helper.bash`: added `_mock_systemctl()` for `is-enabled` (units in `MOCK_SYSTEMCTL_ENABLED` report `enabled`, everything else `disabled`), `MOCK_SYSTEMCTL_ENABLED=""`, `WHIPTAIL_CALLS`/`MOCK_WHIPTAIL_OUTPUT`/`MOCK_WHIPTAIL_RC`, `MOCK_DPKG_INSTALLED` and the `systemctl` entry in the mock list and in `mock_reset()`.
- `tests/desktops.bats` created with 16 tests: `_existing_display_manager` (file read, file-preferred over an enabled unit, enabled-unit fallback, candidate order, missing file, nothing configured), `_offer_pipewire_after_desktop` (5 tests: skip-installed, accept-installs, decline-returns-0, Bullseye package name, wrong package name on 11), `_load_module` (4 tests for xfce/lxde/gnome/kde) and an unknown-module case; 17→33 tests total.
- `.github/workflows/ci.yml` shellcheck severity raised from `--severity=error` to `--severity=warning`.
- `debianito.sh`: `RED`, `GREEN`, `YELLOW`, `CYAN` and `NC` plus `AUTO_YES`, `ALLOW_DESTRUCTIVE` and `DEBIAN_CODENAME` are now `export`ed as cross-file globals.
- `modules/utils.sh`: `HAS_NVIDIA`, `DESKTOP_ENV`, `AUDIO_SERVER`, `DEBIAN_VERSION` and the other cross-file globals are `export`ed.
- `modules/extras/system/software_centers.sh` gained a `#!/usr/bin/env bash` shebang.
- `shellcheck` triage (v0.11.0, baseline `--severity=warning` 25 findings → 0): removed two dead-code lines (`headless` in `extras/dev/dev.sh`, orphan `dev_id` in `firmware.sh`); `SC2206` in `extras/dev/essential.sh` fixed by expanding `$comp_pkgs` to `"${comp_pkgs[@]}"`; `SC2010`/`SC2046` (3 sites) replaced `ls … | grep` with `compgen -G "…"`; `SC2155` (2 sites, `gpu.sh` and `rescue.sh`) split command substitutions into separate lines; `SC2166` in `repos.sh` replaced `-o` with `{ … || … }`; `SC2221`/`SC2222` (2 sites, `sysinfo.sh` and `utils.sh`) collapsed the `wl*|wlp*|wlo*|wlan*` alternation to `wl*`; `SC1090` in `extras.sh` gained a justification comment on the disable directive.
- Final verification: `bash -n` on all 15 modified `.sh` files and `set -euo pipefail` at `debianito.sh:3` both intact; `bats tests/` reports 33 ok / 0 failed; invariants `offers 11`, `confirm_install_list 39` and `_SELECTION_CONFIRMED=0 40` hold.
654 lines
23 KiB
Bash
654 lines
23 KiB
Bash
#!/usr/bin/env bash
|
||
|
||
source "${MODULES_DIR}/repos/migrate.sh" 2>/dev/null || true
|
||
|
||
# State for backup/restore
|
||
REPO_BACKUP_DIR=""
|
||
|
||
backup_current_repos() {
|
||
cleanup_repo_backup # never orphan a previous backup by overwriting the pointer
|
||
REPO_BACKUP_DIR=$(mktemp -d) || {
|
||
REPO_BACKUP_DIR=""
|
||
return 1
|
||
}
|
||
for f in /etc/apt/sources.list /etc/apt/sources.list.d/debian.sources \
|
||
/etc/apt/sources.list.d/debian-backports.list /etc/apt/sources.list.d/debian-backports.sources; do
|
||
if [ -f "$f" ]; then
|
||
local rel="${f#/etc/apt/}"
|
||
mkdir -p "$REPO_BACKUP_DIR/$(dirname "$rel")" || return 1
|
||
cp "$f" "$REPO_BACKUP_DIR/$rel" || return 1
|
||
touch "$REPO_BACKUP_DIR/.backed_up_$(basename "$rel")"
|
||
fi
|
||
done
|
||
}
|
||
|
||
restore_previous_repos() {
|
||
if [ -z "$REPO_BACKUP_DIR" ] || [ ! -d "$REPO_BACKUP_DIR" ]; then
|
||
return
|
||
fi
|
||
echo -e "${RED}Restoring previous repository configuration...${NC}"
|
||
local found=false
|
||
for f in /etc/apt/sources.list /etc/apt/sources.list.d/debian.sources \
|
||
/etc/apt/sources.list.d/debian-backports.list /etc/apt/sources.list.d/debian-backports.sources; do
|
||
local rel="${f#/etc/apt/}"
|
||
local backup_file="$REPO_BACKUP_DIR/$rel"
|
||
if [ -f "$backup_file" ]; then
|
||
if sudo cp "$backup_file" "$f"; then
|
||
found=true
|
||
else
|
||
echo -e "${RED}Failed to restore $f${NC}"
|
||
fi
|
||
elif [ -f "$f" ] && [ ! -f "$REPO_BACKUP_DIR/.backed_up_$(basename "$f")" ]; then
|
||
# Only delete a live file if the manifest proves it did not exist
|
||
# when the backup was taken (protects against a failed cp).
|
||
# SECURITY: Verify file is not a symlink to prevent TOCTOU attack.
|
||
if [ -L "$f" ]; then
|
||
echo -e "${RED}[$f] is a symlink. Aborting to prevent TOCTOU attack.${NC}" >&2
|
||
continue
|
||
fi
|
||
sudo rm -f "$f" || true
|
||
found=true
|
||
fi
|
||
done
|
||
if $found; then
|
||
sudo rm -f /etc/apt/sources.list.disabled
|
||
fi
|
||
rm -rf "$REPO_BACKUP_DIR"
|
||
REPO_BACKUP_DIR=""
|
||
}
|
||
|
||
cleanup_repo_backup() {
|
||
if [ -n "$REPO_BACKUP_DIR" ] && [ -d "$REPO_BACKUP_DIR" ]; then
|
||
rm -rf "$REPO_BACKUP_DIR"
|
||
REPO_BACKUP_DIR=""
|
||
fi
|
||
}
|
||
|
||
# ---------------------------------------------------------------------------
|
||
# Cleanup helpers for embedded backports
|
||
# ---------------------------------------------------------------------------
|
||
|
||
_clean_embedded_backports_classic() {
|
||
local codename="$1"
|
||
local file="/etc/apt/sources.list"
|
||
[ ! -f "$file" ] && return 0
|
||
grep -qE "^[^#]*${codename}-backports\b" "$file" 2>/dev/null || return 0
|
||
if _confirm "Clean Classic Sources" "Remove backports line from ${file}?"; then
|
||
sudo sed -i "/${codename}-backports/d" "$file"
|
||
echo "Removed backports from ${file}"
|
||
fi
|
||
}
|
||
|
||
_clean_embedded_backports_deb822() {
|
||
local codename="$1"
|
||
local file="/etc/apt/sources.list.d/debian.sources"
|
||
[ ! -f "$file" ] && return 0
|
||
|
||
# Only proceed if the Suites line contains the backports token
|
||
grep -qE "^Suites:.*${codename}-backports\b" "$file" 2>/dev/null || return 0
|
||
|
||
if _confirm "Clean deb822 Sources" "Remove backports suite from ${file}?"; then
|
||
# Remove only the backports token, leaving other suites intact
|
||
sudo sed -i "s/[[:space:]]*${codename}-backports[[:space:]]*/ /g" "$file"
|
||
# Clean up whitespace on Suites lines
|
||
sudo sed -i '/^Suites:[[:space:]]*$/d' "$file" 2>/dev/null || true
|
||
echo "Removed backports suite from ${file}"
|
||
fi
|
||
}
|
||
|
||
# ---------------------------------------------------------------------------
|
||
# Write functions – idempotent, with _confirm dialogs
|
||
# ---------------------------------------------------------------------------
|
||
|
||
_write_deb822() {
|
||
local codename="$1" action="$2" bp_enabled="$3" bp_location="$4"
|
||
local components="${5:-main contrib non-free non-free-firmware}"
|
||
|
||
local main_file="/etc/apt/sources.list.d/debian.sources"
|
||
local main_content=""
|
||
main_content+="Types: deb\n"
|
||
main_content+="URIs: https://deb.debian.org/debian\n"
|
||
main_content+="Suites: ${codename} ${codename}-updates\n"
|
||
main_content+="Components: ${components}\n"
|
||
main_content+="\n"
|
||
main_content+="Types: deb\n"
|
||
main_content+="URIs: https://security.debian.org/debian-security\n"
|
||
main_content+="Suites: ${codename}-security\n"
|
||
main_content+="Components: ${components}\n"
|
||
|
||
if content_differs "$main_file" "$main_content"; then
|
||
if _confirm "Deb822 Sources" "Write main deb822 configuration to ${main_file}?"; then
|
||
sudo mkdir -p /etc/apt/sources.list.d
|
||
echo -e "$main_content" | sudo tee "$main_file" >/dev/null || return 1
|
||
echo "Wrote ${main_file}"
|
||
else
|
||
echo "Main repository configuration skipped."
|
||
return 1
|
||
fi
|
||
fi
|
||
|
||
# Backports: always in separate file
|
||
if [ "$bp_enabled" = true ]; then
|
||
_write_deb822_backports "$codename" || true
|
||
else
|
||
_remove_deb822_backports "$codename" || true
|
||
fi
|
||
|
||
# On migration from classic, disable the old file
|
||
if [ "$action" = "migrate" ] && { [ "$bp_location" = "embedded-classic" ] || [ "$bp_location" = "standalone-classic" ]; }; then
|
||
if [ -f /etc/apt/sources.list ]; then
|
||
if _confirm "Disable Classic" "Migrating to deb822. Disable /etc/apt/sources.list?"; then
|
||
sudo mv /etc/apt/sources.list /etc/apt/sources.list.disabled
|
||
echo "Classic sources.list disabled (renamed to sources.list.disabled)"
|
||
fi
|
||
fi
|
||
fi
|
||
|
||
# Clean embedded backports from old classic file if they existed there
|
||
if [ "$bp_location" = "embedded-classic" ]; then
|
||
_clean_embedded_backports_classic "$codename"
|
||
fi
|
||
}
|
||
|
||
_write_deb822_backports() {
|
||
local codename="$1"
|
||
local bp_file="/etc/apt/sources.list.d/debian-backports.sources"
|
||
local bp_content=""
|
||
bp_content+="Types: deb\n"
|
||
bp_content+="URIs: https://deb.debian.org/debian\n"
|
||
bp_content+="Suites: ${codename}-backports\n"
|
||
bp_content+="Components: main contrib non-free non-free-firmware\n"
|
||
|
||
if content_differs "$bp_file" "$bp_content"; then
|
||
if _confirm "Deb822 Backports" "Write backports to ${bp_file}?"; then
|
||
sudo mkdir -p /etc/apt/sources.list.d
|
||
echo -e "$bp_content" | sudo tee "$bp_file" >/dev/null
|
||
echo "Wrote ${bp_file}"
|
||
else
|
||
return 1
|
||
fi
|
||
fi
|
||
|
||
# If backports were formerly embedded in debian.sources, clean them
|
||
grep -qE "^Suites:.*${codename}-backports\b" /etc/apt/sources.list.d/debian.sources 2>/dev/null &&
|
||
_clean_embedded_backports_deb822 "$codename" || true
|
||
}
|
||
|
||
_remove_deb822_backports() {
|
||
local codename="$1"
|
||
local bp_file="/etc/apt/sources.list.d/debian-backports.sources"
|
||
|
||
if [ -f "$bp_file" ]; then
|
||
if _confirm "Remove Backports" "Remove ${bp_file}?"; then
|
||
sudo rm -f "$bp_file"
|
||
echo "Removed ${bp_file}"
|
||
else
|
||
return 1
|
||
fi
|
||
fi
|
||
|
||
# Also clean any embedded backports in main debian.sources
|
||
grep -qE "^Suites:.*${codename}-backports\b" /etc/apt/sources.list.d/debian.sources 2>/dev/null &&
|
||
_clean_embedded_backports_deb822 "$codename"
|
||
|
||
# Clean embedded backports from classic file too (safety net)
|
||
_clean_embedded_backports_classic "$codename"
|
||
}
|
||
|
||
_write_classic() {
|
||
local codename="$1" action="$2" bp_enabled="$3" bp_location="$4"
|
||
local components="${5:-main contrib non-free non-free-firmware}"
|
||
|
||
local main_file="/etc/apt/sources.list"
|
||
local main_content=""
|
||
main_content+="# Official repository\n"
|
||
main_content+="deb https://deb.debian.org/debian ${codename} ${components}\n"
|
||
main_content+="# deb-src https://deb.debian.org/debian ${codename} ${components}\n"
|
||
main_content+="\n"
|
||
main_content+="# Updates\n"
|
||
main_content+="deb https://deb.debian.org/debian ${codename}-updates ${components}\n"
|
||
main_content+="# deb-src https://deb.debian.org/debian ${codename}-updates ${components}\n"
|
||
main_content+="\n"
|
||
main_content+="# Security\n"
|
||
main_content+="deb https://security.debian.org/debian-security ${codename}-security ${components}\n"
|
||
main_content+="# deb-src https://security.debian.org/debian-security ${codename}-security ${components}\n"
|
||
|
||
if content_differs "$main_file" "$main_content"; then
|
||
if _confirm "Classic Sources" "Write main classic configuration to ${main_file}?"; then
|
||
echo -e "$main_content" | sudo tee "$main_file" >/dev/null || return 1
|
||
echo "Wrote ${main_file}"
|
||
else
|
||
echo "Main repository configuration skipped."
|
||
return 1
|
||
fi
|
||
fi
|
||
|
||
# Backports: always in separate file
|
||
if [ "$bp_enabled" = true ]; then
|
||
_write_classic_backports "$codename" || true
|
||
else
|
||
_remove_classic_backports "$codename" || true
|
||
fi
|
||
|
||
# On migration from deb822, disable the old file
|
||
if [ "$action" = "migrate" ]; then
|
||
if [ -f /etc/apt/sources.list.d/debian.sources ]; then
|
||
if _confirm "Disable Deb822" "Migrating to classic format. Disable /etc/apt/sources.list.d/debian.sources?"; then
|
||
sudo mv /etc/apt/sources.list.d/debian.sources /etc/apt/sources.list.d/debian.sources.disabled
|
||
echo "Deb822 sources disabled (renamed to debian.sources.disabled)"
|
||
fi
|
||
fi
|
||
fi
|
||
|
||
# Clean embedded backports from old deb822 file if they existed there
|
||
if [ "$bp_location" = "embedded-deb822" ]; then
|
||
_clean_embedded_backports_deb822 "$codename"
|
||
fi
|
||
}
|
||
|
||
_write_classic_backports() {
|
||
local codename="$1"
|
||
local bp_file="/etc/apt/sources.list.d/debian-backports.list"
|
||
local bp_content=""
|
||
bp_content+="# Backports\n"
|
||
bp_content+="deb https://deb.debian.org/debian ${codename}-backports main contrib non-free non-free-firmware\n"
|
||
|
||
if content_differs "$bp_file" "$bp_content"; then
|
||
if _confirm "Classic Backports" "Write backports to ${bp_file}?"; then
|
||
sudo mkdir -p /etc/apt/sources.list.d
|
||
echo -e "$bp_content" | sudo tee "$bp_file" >/dev/null
|
||
echo "Wrote ${bp_file}"
|
||
else
|
||
return 1
|
||
fi
|
||
fi
|
||
|
||
# If backports were formerly embedded in sources.list, clean them
|
||
grep -qE "^[^#]*${codename}-backports\b" /etc/apt/sources.list 2>/dev/null &&
|
||
_clean_embedded_backports_classic "$codename" || true
|
||
}
|
||
|
||
_remove_classic_backports() {
|
||
local codename="$1"
|
||
local bp_file="/etc/apt/sources.list.d/debian-backports.list"
|
||
|
||
if [ -f "$bp_file" ]; then
|
||
if _confirm "Remove Backports" "Remove ${bp_file}?"; then
|
||
sudo rm -f "$bp_file"
|
||
echo "Removed ${bp_file}"
|
||
else
|
||
return 1
|
||
fi
|
||
fi
|
||
|
||
# Also clean any embedded backports in main sources.list
|
||
grep -qE "^[^#]*${codename}-backports\b" /etc/apt/sources.list 2>/dev/null &&
|
||
_clean_embedded_backports_classic "$codename"
|
||
|
||
# Clean embedded backports from deb822 file too (safety net)
|
||
_clean_embedded_backports_deb822 "$codename"
|
||
}
|
||
|
||
# ---------------------------------------------------------------------------
|
||
# Main entry point
|
||
# ---------------------------------------------------------------------------
|
||
|
||
configure_repos() {
|
||
echo -e "${YELLOW}Repository configuration...${NC}"
|
||
|
||
if [ -z "$DEBIAN_CODENAME" ]; then
|
||
echo -e "${RED}Error: Could not detect Debian codename. Aborting.${NC}"
|
||
return 1
|
||
fi
|
||
|
||
# ── Repositories submenu ──
|
||
while true; do
|
||
local repo_choice
|
||
|
||
if [ "$DEBIAN_CODENAME" = "sid" ]; then
|
||
repo_choice=$(_menu "Configure Repositories" \
|
||
"Select an option:" $TUI_ALTO $TUI_ANCHO 6 \
|
||
"1" "Enable Contrib & Non-Free Components" \
|
||
"2" "Migrate traditional sources.list to DEB822 format" \
|
||
"3" "Back to main menu")
|
||
else
|
||
repo_choice=$(_menu "Configure Repositories" \
|
||
"Select an option:" $TUI_ALTO $TUI_ANCHO 6 \
|
||
"1" "Enable Contrib & Non-Free Components" \
|
||
"2" "Migrate traditional sources.list to DEB822 format" \
|
||
"3" "Setup/Update Backports repositories" \
|
||
"4" "[ADVANCED] Upgrade system branch (Testing / SID)" \
|
||
"5" "Back to main menu")
|
||
fi
|
||
|
||
[ -z "$repo_choice" ] && break
|
||
clear
|
||
|
||
case "$repo_choice" in
|
||
1) _repos_enable_components ;;
|
||
2) _repos_migrate_format ;;
|
||
3)
|
||
if [ "$DEBIAN_CODENAME" = "sid" ]; then
|
||
break
|
||
else
|
||
_repos_setup_backports
|
||
fi
|
||
;;
|
||
4) _branch_migration || true ;;
|
||
5) break ;;
|
||
esac
|
||
done
|
||
}
|
||
|
||
# ---------------------------------------------------------------------------
|
||
# Submenu helpers
|
||
# ---------------------------------------------------------------------------
|
||
|
||
_components_enabled() {
|
||
if [ -f /etc/apt/sources.list.d/debian.sources ]; then
|
||
for c in $(grep "^Components:" /etc/apt/sources.list.d/debian.sources 2>/dev/null | cut -d: -f2-); do
|
||
[ "$c" = "contrib" ] || [ "$c" = "non-free" ] && return 0
|
||
done
|
||
fi
|
||
if [ -f /etc/apt/sources.list ]; then
|
||
local components
|
||
components=$(grep "^[^#]*deb .* main" /etc/apt/sources.list 2>/dev/null | head -1 | sed 's/.*main\s*//')
|
||
for c in $components; do
|
||
[ "$c" = "contrib" ] || [ "$c" = "non-free" ] && return 0
|
||
done
|
||
fi
|
||
return 1
|
||
}
|
||
|
||
_repos_offer_upgrade() {
|
||
local upgradable
|
||
upgradable=$(apt list --upgradable 2>/dev/null | grep -c / || true)
|
||
# BH-005: grep -c / returns rc=1 if apt list produces no output
|
||
# (0 upgradable packages or network failure). pipefail propagates rc=1.
|
||
upgradable=${upgradable:-0}
|
||
[[ "$upgradable" =~ ^[0-9]+$ ]] || upgradable=0
|
||
# Validate that the result is a positive integer.
|
||
# If apt list fails, upgradable stays as "0" and the upgrade is skipped.
|
||
if [ "$upgradable" -gt 0 ]; then
|
||
if _confirm "Upgrade System" "$upgradable packages can be upgraded. Upgrade now?"; then
|
||
_run_cmd "Upgrade" "sudo apt upgrade -y" "Upgrading system..."
|
||
sudo apt-mark unhold tzdata 2>/dev/null || true
|
||
sudo apt autoremove -y
|
||
sudo apt autoclean
|
||
echo -e "${GREEN}System upgraded.${NC}"
|
||
else
|
||
echo "Skipping upgrade."
|
||
fi
|
||
fi
|
||
}
|
||
|
||
# Bootstrap a complete repository configuration from scratch when no active
|
||
# sources exist. Caller must run backup_current_repos() first so that a failed
|
||
# apt update can restore the previous state.
|
||
# Returns: 0 on success, 1 if skipped, declined or failed
|
||
bootstrap_repositories() {
|
||
local components="$1"
|
||
local bp_enabled="${2:-false}"
|
||
local bp_location="${3:-none}"
|
||
|
||
if [ -z "$DEBIAN_CODENAME" ]; then
|
||
_msg "Error" "Cannot bootstrap repositories: Debian codename unknown." 10 65
|
||
return 1
|
||
fi
|
||
|
||
# non-free-firmware does not exist on Bullseye
|
||
if [ "$DEBIAN_VERSION" = "11" ]; then
|
||
components=$(echo "$components" | sed 's/ non-free-firmware//g')
|
||
fi
|
||
|
||
if ! _confirm "Bootstrap Repositories" \
|
||
"No active APT sources were found (empty or missing sources.list).\n\n\
|
||
Configure repositories from scratch?" 10 65; then
|
||
echo "Repository configuration skipped."
|
||
cleanup_repo_backup
|
||
return 1
|
||
fi
|
||
|
||
if has_active_deb_sources; then
|
||
if ! _confirm "Custom Sources Found" \
|
||
"Active sources exist in other files (e.g. sources.list.d/*.sources).\n\n\
|
||
Adding deb.debian.org may duplicate your current mirror configuration. Continue?" 10 65; then
|
||
cleanup_repo_backup
|
||
return 1
|
||
fi
|
||
fi
|
||
|
||
# DEB822 is Trixie-only; Debian 11/12 always use classic
|
||
local use_deb822=false
|
||
if [ "$DEBIAN_VERSION" = "13" ]; then
|
||
local choice
|
||
choice=$(_menu "Repo Format" "Choose the repository format:" 12 60 3 \
|
||
"deb822" "Native DEB822 format (sources.list.d/debian.sources)" \
|
||
"classic" "Classic format (/etc/apt/sources.list)")
|
||
if [ "$choice" = "deb822" ]; then
|
||
use_deb822=true
|
||
fi
|
||
fi
|
||
|
||
if $use_deb822; then
|
||
_write_deb822 "$DEBIAN_CODENAME" "write" "$bp_enabled" "$bp_location" "$components" || {
|
||
cleanup_repo_backup
|
||
return 1
|
||
}
|
||
else
|
||
_write_classic "$DEBIAN_CODENAME" "write" "$bp_enabled" "$bp_location" "$components" || {
|
||
cleanup_repo_backup
|
||
return 1
|
||
}
|
||
fi
|
||
|
||
# Tidy: with deb822 chosen, an empty classic file is no longer needed
|
||
if $use_deb822 && [ -f /etc/apt/sources.list ] && ! grep -qE '^[^#]*\bdeb\b' /etc/apt/sources.list 2>/dev/null; then
|
||
if _confirm "Disable Classic" "An empty /etc/apt/sources.list is no longer needed. Move it aside (sources.list.disabled)?"; then
|
||
sudo mv /etc/apt/sources.list /etc/apt/sources.list.disabled
|
||
echo "Empty sources.list renamed to sources.list.disabled"
|
||
fi
|
||
fi
|
||
|
||
echo "Updating package lists..."
|
||
if sudo apt update; then
|
||
cleanup_repo_backup
|
||
echo -e "${GREEN}Repository components configured.${NC}"
|
||
return 0
|
||
else
|
||
restore_previous_repos
|
||
echo -e "${RED}apt update failed. Previous configuration restored.${NC}"
|
||
return 1
|
||
fi
|
||
}
|
||
|
||
_repos_enable_components() {
|
||
local current_format bp_enabled bp_location components
|
||
current_format=$(detect_repo_format)
|
||
|
||
if _components_enabled; then
|
||
if _confirm "Disable Components" \
|
||
"Contrib and non-free are already enabled. Disable them?"; then
|
||
components="main"
|
||
else
|
||
components=$(detect_active_components)
|
||
echo "Keeping current components: $components"
|
||
fi
|
||
else
|
||
if ! _confirm "Enable Components" \
|
||
"Enable contrib and non-free components?\n\n\
|
||
Needed for proprietary drivers, firmware, and other
|
||
popular software (like gaming platforms and proprietary tools)." 12 60; then
|
||
echo "No changes made."
|
||
_pause
|
||
return
|
||
fi
|
||
if [ "$DEBIAN_VERSION" = "11" ]; then
|
||
components="main contrib non-free"
|
||
else
|
||
components="main contrib non-free non-free-firmware"
|
||
fi
|
||
fi
|
||
|
||
bp_enabled=false
|
||
bp_location="none"
|
||
if detect_backports_status "$DEBIAN_CODENAME"; then
|
||
bp_enabled=true
|
||
bp_location=$(detect_backports_location "$DEBIAN_CODENAME")
|
||
fi
|
||
|
||
backup_current_repos
|
||
|
||
if [ "$current_format" = "none" ]; then
|
||
if ! bootstrap_repositories "$components" "$bp_enabled" "$bp_location"; then
|
||
_pause
|
||
return
|
||
fi
|
||
_repos_offer_upgrade
|
||
echo -e "${GREEN}Cleaning old packages...${NC}"
|
||
sudo apt autoremove -y
|
||
sudo apt autoclean
|
||
echo -e "${GREEN}System packages cleaned.${NC}"
|
||
_pause
|
||
return
|
||
fi
|
||
|
||
echo "Verifying repository configuration (main, updates, security)..."
|
||
if [ "$current_format" = "deb822" ]; then
|
||
# Mixed-state guard: active classic lines alongside deb822 would duplicate sources
|
||
if [ -f /etc/apt/sources.list ] && grep -qE '^[^#]*\bdeb\b' /etc/apt/sources.list 2>/dev/null; then
|
||
if ! _confirm "Duplicate Config" \
|
||
"Active classic sources were also found in /etc/apt/sources.list.\n\n\
|
||
Writing debian.sources may duplicate your configuration. Continue?" 10 65; then
|
||
echo "No changes made."
|
||
_pause
|
||
return
|
||
fi
|
||
fi
|
||
if ! _write_deb822 "$DEBIAN_CODENAME" "write" "$bp_enabled" "$bp_location" "$components"; then
|
||
echo "No changes made."
|
||
_pause
|
||
return
|
||
fi
|
||
else
|
||
if ! _write_classic "$DEBIAN_CODENAME" "write" "$bp_enabled" "$bp_location" "$components"; then
|
||
echo "No changes made."
|
||
_pause
|
||
return
|
||
fi
|
||
fi
|
||
|
||
echo "Updating package lists..."
|
||
if sudo apt update; then
|
||
cleanup_repo_backup
|
||
echo -e "${GREEN}Repository components configured.${NC}"
|
||
_repos_offer_upgrade
|
||
echo -e "${GREEN}Cleaning old packages...${NC}"
|
||
sudo apt autoremove -y
|
||
sudo apt autoclean
|
||
echo -e "${GREEN}System packages cleaned.${NC}"
|
||
else
|
||
restore_previous_repos
|
||
echo -e "${RED}apt update failed. Previous configuration restored.${NC}"
|
||
fi
|
||
_pause
|
||
}
|
||
|
||
_repos_migrate_format() {
|
||
local current_format bp_enabled bp_location
|
||
current_format=$(detect_repo_format)
|
||
|
||
if [ "$current_format" != "classic" ]; then
|
||
echo "Repositories are already in DEB822 format."
|
||
_pause
|
||
return
|
||
fi
|
||
|
||
if [ "$DEBIAN_CODENAME" != "trixie" ]; then
|
||
echo "Format migration is only relevant for Debian 13 (Trixie)."
|
||
_pause
|
||
return
|
||
fi
|
||
|
||
# Preserve existing backports state across format migration
|
||
bp_enabled=false
|
||
bp_location="none"
|
||
if detect_backports_status "$DEBIAN_CODENAME"; then
|
||
bp_enabled=true
|
||
bp_location=$(detect_backports_location "$DEBIAN_CODENAME")
|
||
fi
|
||
|
||
backup_current_repos
|
||
_write_deb822 "$DEBIAN_CODENAME" "migrate" "$bp_enabled" "$bp_location"
|
||
|
||
echo "Updating package lists..."
|
||
if sudo apt update; then
|
||
cleanup_repo_backup
|
||
echo -e "${GREEN}Repository format migrated to DEB822.${NC}"
|
||
else
|
||
restore_previous_repos
|
||
echo -e "${RED}apt update failed. Backup restored.${NC}"
|
||
fi
|
||
_pause
|
||
}
|
||
|
||
_repos_setup_backports() {
|
||
local current_format bp_status bp_location
|
||
current_format=$(detect_repo_format)
|
||
|
||
if detect_backports_status "$DEBIAN_CODENAME"; then
|
||
bp_status="enabled"
|
||
else
|
||
bp_status="disabled"
|
||
fi
|
||
bp_location=$(detect_backports_location "$DEBIAN_CODENAME")
|
||
|
||
echo "Backports are currently $bp_status."
|
||
|
||
local enable_backports=false
|
||
if _confirm "Backports" "Do you want to enable the official Debian Backports repository?\n\n\
|
||
Backports provides newer, selectively updated packages from the next Debian testing branch, recompiled to run stably on your current system.\n
|
||
Answer NO to disable or remove backports if they are currently enabled." 16 70; then
|
||
enable_backports=true
|
||
fi
|
||
|
||
# Nothing to do — already in desired state
|
||
if { $enable_backports && [ "$bp_status" = "enabled" ]; } ||
|
||
{ ! $enable_backports && [ "$bp_status" = "disabled" ]; }; then
|
||
echo "Backports are already configured as requested."
|
||
_pause
|
||
return
|
||
fi
|
||
|
||
backup_current_repos
|
||
|
||
local write_ok=true
|
||
if $enable_backports; then
|
||
if [ "$current_format" = "deb822" ]; then
|
||
_write_deb822_backports "$DEBIAN_CODENAME" || write_ok=false
|
||
else
|
||
_write_classic_backports "$DEBIAN_CODENAME" || write_ok=false
|
||
fi
|
||
elif [ "$current_format" = "deb822" ]; then
|
||
_remove_deb822_backports "$DEBIAN_CODENAME" || write_ok=false
|
||
else
|
||
_remove_classic_backports "$DEBIAN_CODENAME" || write_ok=false
|
||
fi
|
||
|
||
if ! $write_ok; then
|
||
echo "No changes made."
|
||
_pause
|
||
return
|
||
fi
|
||
|
||
echo "Updating package lists..."
|
||
if sudo apt update; then
|
||
cleanup_repo_backup
|
||
echo -e "${GREEN}Backports configured.${NC}"
|
||
else
|
||
restore_previous_repos
|
||
echo -e "${RED}apt update failed. Backup restored.${NC}"
|
||
fi
|
||
_pause
|
||
}
|