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.
76 lines
2.3 KiB
Bash
76 lines
2.3 KiB
Bash
#!/usr/bin/env bash
|
|
# fetch.sh — System info / fetch tools
|
|
|
|
_cat_fetch() {
|
|
local fetch_pkg
|
|
if [ "$DEBIAN_CODENAME" = "bookworm" ]; then
|
|
fetch_pkg="neofetch"
|
|
else
|
|
fetch_pkg="fastfetch"
|
|
fi
|
|
|
|
local fetch_state; fetch_state=$(_state "$fetch_pkg")
|
|
local linuxlogo_state; linuxlogo_state=$(_state "linuxlogo")
|
|
local screenfetch_state; screenfetch_state=$(_state "screenfetch")
|
|
|
|
local hyfetch_state="OFF"
|
|
if [ "$DEBIAN_CODENAME" = "trixie" ]; then
|
|
hyfetch_state=$(_state "hyfetch")
|
|
fi
|
|
|
|
local -a items=()
|
|
|
|
if [ "$fetch_pkg" = "fastfetch" ]; then
|
|
items+=("fastfetch" "System info fetcher" "$fetch_state")
|
|
if [ "$DEBIAN_CODENAME" = "trixie" ]; then
|
|
items+=("hyfetch" "Neofetch with pride flags" "$hyfetch_state")
|
|
fi
|
|
fi
|
|
items+=("linuxlogo" "Linux logo + system info" "$linuxlogo_state")
|
|
if [ "$fetch_pkg" = "neofetch" ]; then
|
|
items+=("neofetch" "System info fetcher" "$fetch_state")
|
|
if [ "$DEBIAN_CODENAME" = "trixie" ]; then
|
|
items+=("hyfetch" "Neofetch with pride flags" "$hyfetch_state")
|
|
fi
|
|
fi
|
|
items+=("screenfetch" "System info (BSD/Linux)" "$screenfetch_state")
|
|
|
|
local item_count=${#items[@]}
|
|
local lista_alto=$((item_count > TUI_ALTO_LISTA ? TUI_ALTO_LISTA : item_count))
|
|
local choices
|
|
choices=$(_checklist "Fetch Tools" "Select system info tools:" $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
|
|
case $pkg in
|
|
neofetch|fastfetch)
|
|
if ! is_installed "$pkg"; then
|
|
_run_install "$pkg"
|
|
else
|
|
echo "$pkg already installed."
|
|
fi
|
|
;;
|
|
*)
|
|
if ! is_installed "$pkg"; then
|
|
_run_install "$pkg"
|
|
else
|
|
echo "$pkg already installed."
|
|
fi
|
|
;;
|
|
esac
|
|
done
|
|
|
|
echo -e "${GREEN}Fetch tools installed.${NC}"
|
|
}
|