mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-10-31 13:08:06 +00:00
stornic56
9828ea439c
- Extracted hardware detection logic from firmware.sh into new modules/hw_detect.sh. Declares shared arrays (PCI_NET_DEVS, USB_WIFI_DEVS, etc) and _detect_all_network_devices() function. The main script now sources hw_detect.sh immediately after utils.sh. firmware.sh retains only _DETECTED_FW_PKGS and _FW_PLAN_PKG_LINES plus installation logic — the detection loop is fully removed, eliminating the circular dependency with bluetooth.sh. - Fixed interrupt safety in main script: removed pkill -f "apt.*install" and pkill -f "dpkg.*configure" from _on_interrupt(); updated exit message to "Temp files cleaned." Only the signal handler (trap _on_interrupt INT TERM) remains. - Added strict URL validation to modules/gaming/heroic.sh and modules/gaming/tools.sh using regex ^https://[A-Za-z0-9./_-]+\.deb$ before passing $deb_url to _run_cmd. Blocks command substitution, non-https URLs, and path traversal attempts that could bypass shell quoting. - Implemented real Bullseye Archive rewrite in modules/bullseye/legacy.sh: adds idempotency check (grep -q archive.debian.org && return 0), creates timestamped backup of /etc/apt/sources.list with sudo cp, writes exact archive Debian sources via sudo tee heredoc, and runs sudo apt-get update || true on failure. - Added local scope to modules/bluetooth.sh variable service_enable_only=false before the conditional assignment, preventing state bleed from the previous global-only declaration. - Applied safe array pattern (while IFS= read -r _pkg; do ...) across 32+ files in modules/extras/* and modules/bullseye/legacy.sh, replacing all vulnerable for pkg in $cleaned / for pkg in $install_list loops. Eliminates word-splitting and command-injection risks.
56 lines
2.4 KiB
Bash
56 lines
2.4 KiB
Bash
#!/usr/bin/env bash
|
|
# fonts.sh — Fonts
|
|
|
|
_cat_fonts() {
|
|
local headless=false
|
|
_is_headless && headless=true
|
|
local -a items=()
|
|
if ! $headless; then
|
|
local bebas_state; bebas_state=$(_state "fonts-bebas-neue")
|
|
local anon_state; anon_state=$(_state "fonts-anonymous-pro")
|
|
local verana_state; verana_state=$(_state "fonts-adf-verana")
|
|
local f3270_state; f3270_state=$(_state "fonts-3270")
|
|
local liberation_state; liberation_state=$(_state "fonts-liberation")
|
|
local mscore_state; mscore_state=$(_state "ttf-mscorefonts-installer")
|
|
local ubuntu_state; ubuntu_state=$(_state "fonts-ubuntu")
|
|
local recommended_state; recommended_state=$(_state "fonts-recommended")
|
|
items+=(
|
|
"fonts-bebas-neue" "Bebas Neue (display)" "$bebas_state"
|
|
"fonts-anonymous-pro" "Anonymous Pro (monospace)" "$anon_state"
|
|
"fonts-adf-verana" "ADF Verana (sans-serif)" "$verana_state"
|
|
"fonts-3270" "IBM 3270 terminal font" "$f3270_state"
|
|
"fonts-liberation" "Liberation (MS-compatible)" "$liberation_state"
|
|
"ttf-mscorefonts-installer" "Microsoft fonts (EULA required)" "$mscore_state"
|
|
"fonts-ubuntu" "Ubuntu font family" "$ubuntu_state"
|
|
"fonts-recommended" "Debian recommended fonts" "$recommended_state"
|
|
)
|
|
fi
|
|
|
|
local item_count=${#items[@]}
|
|
local lista_alto=$((item_count > TUI_ALTO_LISTA ? TUI_ALTO_LISTA : item_count))
|
|
local choices
|
|
choices=$(_checklist "Fonts" "Check [*] the packages you want installed/updated on your system.\n" $TUI_ALTO $TUI_ANCHO $lista_alto \
|
|
"${items[@]}" \
|
|
)
|
|
clear
|
|
|
|
[ -z "$choices" ] && return
|
|
|
|
local cleaned; cleaned=$(echo "$choices" | tr -d '"')
|
|
|
|
# BH-004: Convert to array to avoid word splitting and injection.
|
|
local -a _pkgs=()
|
|
while IFS= read -r _pkg; do
|
|
[ -n "$_pkg" ] && _pkgs+=("$_pkg")
|
|
done < <(echo "$cleaned" | tr ' ' '\n')
|
|
for pkg in "${_pkgs[@]}"; do
|
|
if ! is_installed "$pkg"; then
|
|
_run_install "$pkg"
|
|
else
|
|
echo "$pkg already installed."
|
|
fi
|
|
done
|
|
|
|
echo -e "${GREEN}Fonts installed.${NC}"
|
|
}
|