mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-10-31 13:08:06 +00:00
89233b0750
- `.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.
190 lines
6.3 KiB
Bash
190 lines
6.3 KiB
Bash
#!/usr/bin/env bash
|
|
# rescue.sh — UEFI boot repair and system rescue utilities
|
|
|
|
_rescue_boot_sb() {
|
|
echo -e "${YELLOW}UEFI Secure Boot repair...${NC}"
|
|
|
|
if [ ! -d /sys/firmware/efi ]; then
|
|
echo -e "${RED}Not a UEFI system. Skipping.${NC}"
|
|
_pause
|
|
return
|
|
fi
|
|
|
|
local sb_state
|
|
sb_state=$(mokutil --sb-state 2>/dev/null)
|
|
if ! echo "$sb_state" | grep -qi "enabled"; then
|
|
echo -e "${YELLOW}Secure Boot is not enabled. No refirm needed.${NC}"
|
|
_pause
|
|
return
|
|
fi
|
|
|
|
if ! _confirm "Secure Boot Repair" \
|
|
"Secure Boot is enabled.\n\nReinstall and refirm shim-signed + GRUB?\n\nThis fixes boot issues where Debian is skipped\nin UEFI after kernel/driver changes."; then
|
|
echo "Skipped."
|
|
_pause
|
|
return
|
|
fi
|
|
|
|
local efi_dir="/boot/efi"
|
|
[ ! -d "$efi_dir" ] && efi_dir="/boot"
|
|
|
|
_run_cmd "Refirm" \
|
|
"sudo apt install --reinstall -y shim-signed grub-efi-amd64-signed linux-image-amd64" \
|
|
"Reinstalling signed boot packages..."
|
|
_run_cmd "GRUB Install" \
|
|
"sudo grub-install --target=x86_64-efi --efi-directory=$efi_dir --bootloader-id=debian --recheck" \
|
|
"Reinstalling GRUB to EFI partition..."
|
|
_run_cmd "GRUB Config" \
|
|
"sudo update-grub" \
|
|
"Regenerating GRUB configuration..."
|
|
|
|
echo -e "${GREEN}Boot repair complete. Reboot to verify.${NC}"
|
|
_pause
|
|
}
|
|
|
|
_rescue_initramfs() {
|
|
if ! _confirm "Initramfs" "Regenerate initramfs for all kernels?\n\nFixes boot issues caused by missing drivers\nor corrupted initrd images."; then
|
|
echo "Skipped."
|
|
_pause
|
|
return
|
|
fi
|
|
_run_cmd "Initramfs" "sudo update-initramfs -u -k all" "Regenerating initramfs for all kernels..."
|
|
echo -e "${GREEN}Initramfs regenerated.${NC}"
|
|
_pause
|
|
}
|
|
|
|
# ----------------------------------------------------------------------
|
|
# GRUB helpers
|
|
# ----------------------------------------------------------------------
|
|
|
|
_set_grub_var() {
|
|
local var="$1" val="$2" file="/etc/default/grub"
|
|
if grep -q "^${var}=" "$file" 2>/dev/null; then
|
|
sudo sed -i "s/^${var}=.*/${var}=${val}/" "$file"
|
|
elif grep -q "^#${var}=" "$file" 2>/dev/null; then
|
|
sudo sed -i "s/^#${var}=.*/${var}=${val}/" "$file"
|
|
else
|
|
echo "${var}=${val}" | sudo tee -a "$file" >/dev/null
|
|
fi
|
|
}
|
|
|
|
_apply_grub_setting() {
|
|
local timeout="$1" style="$2" recordfail="$3" os_prober="$4"
|
|
local file="/etc/default/grub"
|
|
local backup
|
|
backup="${file}.backup.$(date +%Y%m%d_%H%M%S)"
|
|
local override="/etc/default/grub.d/99_script_override.cfg"
|
|
|
|
sudo cp "$file" "$backup"
|
|
|
|
_set_grub_var GRUB_TIMEOUT "$timeout"
|
|
_set_grub_var GRUB_TIMEOUT_STYLE "$style"
|
|
_set_grub_var GRUB_RECORDFAIL_TIMEOUT "$recordfail"
|
|
[ -n "$os_prober" ] && _set_grub_var GRUB_DISABLE_OS_PROBER "$os_prober"
|
|
|
|
sudo mkdir -p /etc/default/grub.d
|
|
if [ -n "$os_prober" ]; then
|
|
cat << EOF | sudo tee "$override" > /dev/null
|
|
GRUB_TIMEOUT_STYLE=$style
|
|
GRUB_TIMEOUT=$timeout
|
|
GRUB_RECORDFAIL_TIMEOUT=$recordfail
|
|
GRUB_DISABLE_OS_PROBER=$os_prober
|
|
EOF
|
|
else
|
|
cat << EOF | sudo tee "$override" > /dev/null
|
|
GRUB_TIMEOUT=$timeout
|
|
GRUB_TIMEOUT_STYLE=$style
|
|
GRUB_RECORDFAIL_TIMEOUT=$recordfail
|
|
EOF
|
|
fi
|
|
|
|
local summary
|
|
summary="Settings applied:\n\n"
|
|
summary+=" GRUB_TIMEOUT=$timeout\n"
|
|
summary+=" GRUB_TIMEOUT_STYLE=$style\n"
|
|
summary+=" GRUB_RECORDFAIL_TIMEOUT=$recordfail\n"
|
|
[ -n "$os_prober" ] && summary+=" GRUB_DISABLE_OS_PROBER=$os_prober\n"
|
|
summary+="\nRunning update-grub..."
|
|
|
|
echo -e "$summary"
|
|
|
|
if sudo update-grub >/dev/null 2>&1; then
|
|
_msg "GRUB Settings" \
|
|
"GRUB settings applied successfully!\n\nBackup saved: ${backup}\n\nReboot to see the changes."
|
|
else
|
|
echo -e "${RED}update-grub failed. Restoring backup...${NC}"
|
|
sudo cp "$backup" "$file"
|
|
sudo rm -f "$override"
|
|
_msg "Error" "update-grub failed.\nBackup restored from ${backup}\nOverride removed: ${override}."
|
|
fi
|
|
}
|
|
|
|
_grub_menu_settings() {
|
|
while true; do
|
|
local choice
|
|
choice=$(_menu "GRUB Boot Menu Settings" \
|
|
"Configure when and how the GRUB menu appears:" \
|
|
$TUI_ALTO $TUI_ANCHO $TUI_ALTO_LISTA \
|
|
"1" "Disable GRUB menu on start (Fastest boot)" \
|
|
"2" "Faster boot (Show 3-sec countdown)" \
|
|
"3" "Default boot (Show menu for 5 secs)" \
|
|
"4" "Custom timeout (Input seconds)" \
|
|
"5" "Back")
|
|
|
|
[ -z "$choice" ] && return
|
|
clear
|
|
|
|
case "$choice" in
|
|
1)
|
|
if _confirm "Disable GRUB Menu" \
|
|
"GRUB menu will be hidden entirely for fastest boot.\n\nTo access the menu on next boot, press and hold ESC\nimmediately after powering on.\n\nProceed?"; then
|
|
_apply_grub_setting 0 hidden 0 true
|
|
fi
|
|
;;
|
|
2)
|
|
_apply_grub_setting 3 menu 3 ""
|
|
;;
|
|
3)
|
|
_apply_grub_setting 5 menu 5 ""
|
|
;;
|
|
4)
|
|
local custom_timeout
|
|
custom_timeout=$(whiptail --title "Custom GRUB Timeout" \
|
|
--inputbox "Enter the GRUB timeout in seconds.\n\nUse -1 for indefinite wait." \
|
|
10 60 "" 3>&1 1>&2 2>&3 || true)
|
|
if [ -n "$custom_timeout" ]; then
|
|
if [[ "$custom_timeout" =~ ^-?[0-9]+$ ]]; then
|
|
_apply_grub_setting "$custom_timeout" menu "$custom_timeout" ""
|
|
else
|
|
_msg "Invalid Input" "Please enter a valid integer (e.g. 0, 5, -1)."
|
|
fi
|
|
fi
|
|
;;
|
|
5) return ;;
|
|
esac
|
|
done
|
|
}
|
|
|
|
rescue_boot() {
|
|
while true; do
|
|
local choice
|
|
choice=$(_menu "Boot Rescue + GRUB Configuration" \
|
|
"Select an operation:" \
|
|
$TUI_ALTO $TUI_ANCHO $TUI_ALTO_LISTA \
|
|
"1" "GRUB Boot Menu Settings" \
|
|
"2" "Refirm Secure Boot (shim + GRUB)" \
|
|
"3" "Regenerate initramfs (all kernels)" \
|
|
"4" "Return to main menu")
|
|
|
|
[ -z "$choice" ] && return
|
|
clear
|
|
|
|
case "$choice" in
|
|
1) _grub_menu_settings ;;
|
|
2) _rescue_boot_sb ;;
|
|
3) _rescue_initramfs ;;
|
|
4) return ;;
|
|
esac
|
|
done
|
|
}
|