mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-10-31 13:08:06 +00:00
stornic56
454207209a
- 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.
71 lines
3.0 KiB
Bash
71 lines
3.0 KiB
Bash
#!/usr/bin/env bash
|
|
# icons.sh — Icon themes
|
|
|
|
_cat_icons() {
|
|
local headless=false
|
|
_is_headless && headless=true
|
|
local -a items=()
|
|
if ! $headless; then
|
|
local breeze_state; breeze_state=$(_state "breeze-icon-theme")
|
|
local deepin_state; deepin_state=$(_state "deepin-icon-theme")
|
|
local ele_state; ele_state=$(_state "elementary-icon-theme")
|
|
local ele_xfce_state; ele_xfce_state=$(_state "elementary-xfce-icon-theme")
|
|
local moka_state; moka_state=$(_state "moka-icon-theme")
|
|
local numix_state; numix_state=$(_state "numix-icon-theme")
|
|
local numix_c_state; numix_c_state=$(_state "numix-icon-theme-circle")
|
|
local obsidian_state; obsidian_state=$(_state "obsidian-icon-theme")
|
|
local papirus_state; papirus_state=$(_state "papirus-icon-theme")
|
|
local paper_state; paper_state=$(_state "paper-icon-theme")
|
|
local suru_state; suru_state=$(_state "suru-icon-theme")
|
|
|
|
local kf6_state="OFF"
|
|
if [ "$DEBIAN_CODENAME" = "trixie" ]; then
|
|
kf6_state=$(_state "kf6-breeze-icon-theme")
|
|
fi
|
|
|
|
items=(
|
|
"breeze-icon-theme" "Breeze icon theme" "$breeze_state"
|
|
"deepin-icon-theme" "Deepin icon theme" "$deepin_state"
|
|
"elementary-icon-theme" "Elementary icon theme" "$ele_state"
|
|
"elementary-xfce-icon-theme" "Elementary Xfce icons" "$ele_xfce_state"
|
|
"moka-icon-theme" "Moka icon theme" "$moka_state"
|
|
"numix-icon-theme" "Numix icon theme" "$numix_state"
|
|
"numix-icon-theme-circle" "Numix Circle icon theme" "$numix_c_state"
|
|
"obsidian-icon-theme" "Obsidian icon theme" "$obsidian_state"
|
|
"papirus-icon-theme" "Papirus icon theme" "$papirus_state"
|
|
"paper-icon-theme" "Paper icon theme" "$paper_state"
|
|
"suru-icon-theme" "Suru icon theme" "$suru_state"
|
|
)
|
|
if [ "$DEBIAN_CODENAME" = "trixie" ]; then
|
|
items+=("kf6-breeze-icon-theme" "KF6 Breeze icon theme" "$kf6_state")
|
|
fi
|
|
fi
|
|
|
|
local item_count=${#items[@]}
|
|
local lista_alto=$((item_count > TUI_ALTO_LISTA ? TUI_ALTO_LISTA : item_count))
|
|
local choices
|
|
choices=$(_checklist "Icon Themes" "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}Icon themes installed.${NC}"
|
|
}
|